Write files to volume

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

src/extension/host-binary/cmd/commands/volume.go

@@ -1,7 +1,9 @@
 package commands
 
 import (
+	"bytes"
 	"context"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -11,43 +13,66 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type FileContent struct {
+	VolumeId   string `json:"volumeId"`
+	TargetPath string `json:"targetPath"`
+	Contents   string `json:"contents"`
+}
+
 func ReadFromVolume(ctx context.Context) *cobra.Command {
 	return &cobra.Command{
 		Use:   "read-from-volume",
 		Short: "Read a file from the extension's volume",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			content, err := readConfig(ctx, args[0])
-			if err != nil {
+			filename := args[0]
+
+			var content FileContent
+			if err := get(ctx, httpClient(), "/volume-file-content?volumeId=docker-prompts&targetPath="+filename, &content); err != nil {
 				return err
 			}
-			fmt.Print(content)
+
+			fmt.Print(content.Contents)
 			return nil
 		},
 	}
 }
 
-func readConfig(ctx context.Context, filename string) (string, error) {
-	httpClient := &http.Client{
+func WriteToVolume(ctx context.Context) *cobra.Command {
+	return &cobra.Command{
+		Use:   "write-to-volume",
+		Short: "Write some base64 encoded content to a file on the extension's volume",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			filename := args[0]
+			contentBase64 := args[1]
+
+			content, err := base64.StdEncoding.DecodeString(contentBase64)
+			if err != nil {
+				return err
+			}
+
+			return post(ctx, httpClient(), "/volume-file-content", FileContent{
+				VolumeId:   "docker-prompts",
+				TargetPath: filename,
+				Contents:   string(content),
+			})
+		},
+	}
+}
+
+func httpClient() *http.Client {
+	return &http.Client{
 		Transport: &http.Transport{
 			DialContext: func(ctx context.Context, _, _ string) (conn net.Conn, err error) {
 				return dialVolumeContents(ctx)
 			},
 		},
 	}
-
-	var content struct {
-		Contents string `json:"contents"`
-	}
-	if err := query(ctx, httpClient, "GET", "/volume-file-content?volumeId=docker-prompts&targetPath="+filename, &content); err != nil {
-		return "", err
-	}
-
-	return content.Contents, nil
 }
 
-func query(ctx context.Context, httpClient *http.Client, method string, endpoint string, v any) error {
-	req, err := http.NewRequestWithContext(ctx, method, "http://localhost"+endpoint, nil)
+func get(ctx context.Context, httpClient *http.Client, endpoint string, v any) error {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://localhost"+endpoint, nil)
 	if err != nil {
 		return err
 	}
@@ -67,5 +92,33 @@ func query(ctx context.Context, httpClient *http.Client, method string, endpoint
 	if err := json.Unmarshal(buf, &v); err != nil {
 		return err
 	}
+
+	return nil
+}
+
+func post(ctx context.Context, httpClient *http.Client, endpoint string, v any) error {
+	payload, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, "http://localhost"+endpoint, bytes.NewReader(payload))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("X-DockerDesktop-Host", "vm.docker.internal")
+	req.Header.Set("Content-Type", "application/json")
+
+	response, err := httpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer response.Body.Close()
+
+	_, err = io.ReadAll(response.Body)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }

src/extension/host-binary/cmd/main.go

@@ -29,6 +29,7 @@ func main() {
 	cmd.AddCommand(DeriveSecret(ctx))
 	cmd.AddCommand(commands.CurrentUser(ctx))
 	cmd.AddCommand(commands.ReadFromVolume(ctx))
+	cmd.AddCommand(commands.WriteToVolume(ctx))
 	if err := cmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

src/extension/ui/src/utils/Files.ts

@@ -70,20 +70,16 @@ export const writeToPromptsVolume = async (
   filename: string,
   content: string
 ) => {
-  return tryRunImageSync(client, [
-    "--rm",
-    "-v",
-    "docker-prompts:/workdir",
-    "--network=none",
-    "-w",
-    "/workdir",
-    BUSYBOX,
-    "/bin/sh",
-    "-c",
-    client.host.platform === "win32"
-      ? `\"echo ${encode(content)} | base64 -d > ${filename}\"`
-      : `'echo ${encode(content)} | base64 -d > ${filename}'`,
-  ]);
+  try {
+    await client.extension.host?.cli.exec("host-binary", ["write-to-volume", filename, encode(content)]);
+  } catch (e) {
+    if (e instanceof Error) {
+      client.desktopUI.toast.error(e.message);
+    }
+    if ((e as ExecResult).stderr) {
+      client.desktopUI.toast.error(JSON.stringify(e));
+    }
+  }
 };
 
 export const writeToMount = async (