fixup! feat(VSCode): add support for IDE inside Flatpak

Author: acolombier

cmd/agent/container/setup.go

@@ -413,6 +413,8 @@ func (cmd *SetupContainerCmd) installIDE(setupInfo *config.Result, ide *provider
 		return cmd.setupVSCode(setupInfo, ide.Options, vscode.FlavorPositron, log)
 	case string(config2.IDECodium):
 		return cmd.setupVSCode(setupInfo, ide.Options, vscode.FlavorCodium, log)
+	case string(config2.IDECodiumInsiders):
+		return cmd.setupVSCode(setupInfo, ide.Options, vscode.FlavorCodiumInsiders, log)
 	case string(config2.IDEOpenVSCode):
 		return cmd.setupOpenVSCode(setupInfo, ide.Options, log)
 	case string(config2.IDEGoland):

pkg/ide/vscode/open.go

@@ -1,6 +1,7 @@
 package vscode
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -76,7 +77,7 @@ func openViaCLI(ctx context.Context, workspace, folder string, newWindow bool, f
 	}
 
 	if codePath[0] == "flatpak" {
-		log.Debugf("Running with Flatpak suing the package %s.", codePath[2])
+		log.Debugf("Running with Flatpak using the package %s.", codePath[2])
 		out, err := exec.Command(codePath[0], "ps", "--columns=application").Output()
 		if err != nil {
 			return command.WrapCommandError(out, err)
@@ -144,10 +145,18 @@ func openViaCLI(ctx context.Context, workspace, folder string, newWindow bool, f
 	folderUriArg := fmt.Sprintf("--folder-uri=vscode-remote://ssh-remote+%s.devpod/%s", workspace, folder)
 	args = append(codePath, args...)
 	args = append(args, folderUriArg)
+	cmd := exec.CommandContext(ctx, args[0], args[1:]...)
+	var b bytes.Buffer
+	if codePath[0] != "flatpak" {
+		cmd.Stdout = &b
+		cmd.Stderr = &b
+	} else {
+		log.Debug("Skipping output capture due to issue with `flatpak run` leading the command to hang")
+	}
 	log.Debugf("Run %s command %s %s", flavor.DisplayName(), args[0], strings.Join(args[1:], " "))
-	out, err = exec.CommandContext(ctx, args[0], args[1:]...).CombinedOutput()
+	err = cmd.Run()
 	if err != nil {
-		return command.WrapCommandError(out, err)
+		return command.WrapCommandError(b.Bytes(), err)
 	}
 
 	return nil

pkg/ide/vscode/vscode.go

@@ -341,6 +341,48 @@ func (o *VsCodeServer) findServerBinaryPath(location string) string {
 		return binPath
 	}
 
+	if o.flavor == FlavorCodiumInsiders {
+		// check legacy location `$HOME/.vscodium-server-insiders/bin`
+		binDir := filepath.Join(location, "bin")
+		for {
+			if time.Now().After(deadline) {
+				o.log.Warn("Timed out installing vscodium-server-insiders")
+				break
+			}
+			entries, err := os.ReadDir(binDir)
+			if err != nil || len(entries) == 0 {
+				o.log.Infof("Read dir %s: %v", binDir, err)
+				o.log.Info("Wait until vscodium-server-insiders is installed...")
+				// check new location `$HOME/.vscodium-server-insiders/cli/servers/Stable-<version>/server/bin/code-server`
+				newBinPath, err := o.findCodeServerBinary(location)
+				if err != nil {
+					o.log.Infof("Read new location %s: %v", location, err)
+					o.log.Info("Wait until vscodium is installed...")
+					time.Sleep(time.Second * 3)
+					continue
+				}
+
+				binPath = newBinPath
+				break
+			}
+
+			binPath = filepath.Join(binDir, entries[0].Name(), "bin", "codium-server-insiders")
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second*4)
+			out, err := exec.CommandContext(ctx, binPath, "--help").CombinedOutput()
+			cancel()
+			if err != nil {
+				o.log.Infof("Execute %s: %v", binPath, command.WrapCommandError(out, err))
+				o.log.Info("Wait until vscodium-server-insiders is installed...")
+				time.Sleep(time.Second * 3)
+				continue
+			}
+
+			break
+		}
+
+		return binPath
+	}
+
 	if o.flavor == FlavorInsiders {
 		serversDir := filepath.Join(location, "cli", "servers")
 		for {
@@ -457,6 +499,8 @@ func prepareServerLocation(userName string, create bool, flavor Flavor) (string,
 		folderName = ".positron-server"
 	case FlavorCodium:
 		folderName = ".vscodium-server"
+	case FlavorCodiumInsiders:
+		folderName = ".vscodium-server-insiders"
 	}
 
 	folder := filepath.Join(homeFolder, folderName)