Mar 27, 2025 · Mar 24, 2025 · Mar 24, 2025 · Mar 25, 2025 · Mar 25, 2025 · Mar 25, 2025
diff --git a/agent/agent.go b/agent/agent.go
 //
 // An example is VS Code Remote, which must know the directory
 // before initializing a connection.
 manifest.Directory, err =expandDirectory(manifest.Directory)
 manifest.Directory, err =expandPathToAbs(manifest.Directory)
 if err != nil {
 return xerrors.Errorf("expand directory: %w", err)
 }
 }
 }

 err = a.scriptRunner.Init(manifest.Scripts, aAPI.ScriptCompleted)
 var (
 scripts          = manifest.Scripts
 scriptRunnerOpts []agentscripts.InitOption
 )
 if a.experimentalDevcontainersEnabled {
 var dcScripts []codersdk.WorkspaceAgentScript
 scripts, dcScripts = agentcontainers.ExtractAndInitializeDevcontainerScripts(a.logger, expandPathToAbs, manifest.Devcontainers, scripts)
 // See ExtractAndInitializeDevcontainerScripts for motivation
 // behind running dcScripts as post start scripts.
 scriptRunnerOpts = append(scriptRunnerOpts, agentscripts.WithPostStartScripts(dcScripts...))
 }
 err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
 if err != nil {
 return xerrors.Errorf("init script runner: %w", err)
 }
 err = a.trackGoroutine(func() {
 start := time.Now()
 // here we use the graceful context because the script runner is not directly tied
 // to the agent API.
 // Here we use the graceful context because the script runner is
 // not directly tied to the agent API.
 //
 // First we run the start scripts to ensure the workspace has
 // been initialized and then the post start scripts which may
 // depend on the workspace start scripts.
 //
 // Measure the time immediately after the start scripts have
 // finished (both start and post start). For instance, an
 // autostarted devcontainer will be included in this time.
 err := a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecuteStartScripts)
 // Measure the time immediately after the script has finished
 err = errors.Join(err, a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecutePostStartScripts))
 dur := time.Since(start).Seconds()
 if err != nil {
 a.logger.Warn(ctx, "startup script(s) failed", slog.Error(err))
 return u.HomeDir, nil
 }

 // expandDirectory converts a directory path to an absolute path.
 // It primarily resolves the home directory and any environment
 // variables that may be set
 func expandDirectory(dir string) (string, error) {
 if dir == "" {
 // expandPathToAbs converts a path to an absolute path. It primarily resolves
 // the home directory and any environment variables that may be set.
 func expandPathToAbs(path string) (string, error) {
 if path == "" {
 return "", nil
 }
 ifdir[0] == '~' {
 ifpath[0] == '~' {
 home, err := userHomeDir()
 if err != nil {
 return "", err
 }
 dir = filepath.Join(home,dir[1:])
 path = filepath.Join(home,path[1:])
 }
 dir = os.ExpandEnv(dir)
 path = os.ExpandEnv(path)

 if !filepath.IsAbs(dir) {
 if !filepath.IsAbs(path) {
 home, err := userHomeDir()
 if err != nil {
 return "", err
 }
 dir = filepath.Join(home,dir)
 path = filepath.Join(home,path)
 }
 returndir, nil
 returnpath, nil
 }

 // EnvAgentSubsystem is the environment variable used to denote the
diff --git a/agent/agent_test.go b/agent/agent_test.go
 require.ErrorIs(t, tr.ReadUntil(ctx, nil), io.EOF)
 }

 // This tests end-to-end functionality of auto-starting a devcontainer.
 // It runs "devcontainer up" which creates a real Docker container. As
 // such, it does not run by default in CI.
 //
 // You can run it manually as follows:
 //
 // CODER_TEST_USE_DOCKER=1 go test -count=1 ./agent -run TestAgent_DevcontainerAutostart
 func TestAgent_DevcontainerAutostart(t *testing.T) {
 t.Parallel()
 if os.Getenv("CODER_TEST_USE_DOCKER") != "1" {
 t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")
 }

 ctx := testutil.Context(t, testutil.WaitLong)

 // Connect to Docker
 pool, err := dockertest.NewPool("")
 require.NoError(t, err, "Could not connect to docker")

 // Prepare temporary devcontainer for test (mywork).
 devcontainerID := uuid.New()
 tempWorkspaceFolder := t.TempDir()
 tempWorkspaceFolder = filepath.Join(tempWorkspaceFolder, "mywork")
 t.Logf("Workspace folder: %s", tempWorkspaceFolder)
 devcontainerPath := filepath.Join(tempWorkspaceFolder, ".devcontainer")
 err = os.MkdirAll(devcontainerPath, 0o755)
 require.NoError(t, err, "create devcontainer directory")
 devcontainerFile := filepath.Join(devcontainerPath, "devcontainer.json")
 err = os.WriteFile(devcontainerFile, []byte(`{
        "name": "mywork",
        "image": "busybox:latest",
        "cmd": ["sleep", "infinity"]
    }`), 0o600)
 require.NoError(t, err, "write devcontainer.json")

 manifest := agentsdk.Manifest{
 // Set up pre-conditions for auto-starting a devcontainer, the script
 // is expected to be prepared by the provisioner normally.
 Devcontainers: []codersdk.WorkspaceAgentDevcontainer{
 {
 ID:              devcontainerID,
 Name:            "test",
 WorkspaceFolder: tempWorkspaceFolder,
 },
 },
 Scripts: []codersdk.WorkspaceAgentScript{
 {
 ID:          devcontainerID,
 LogSourceID: agentsdk.ExternalLogSourceID,
 RunOnStart:  true,
 Script:      "echo this-will-be-replaced",
 DisplayName: "Dev Container (test)",
 },
 },
 }
 // nolint: dogsled
 conn, _, _, _, _ := setupAgent(t, manifest, 0, func(_ *agenttest.Client, o *agent.Options) {
 o.ExperimentalDevcontainersEnabled = true
 })

 t.Logf("Waiting for container with label: devcontainer.local_folder=%s", tempWorkspaceFolder)

 var container docker.APIContainers
 require.Eventually(t, func() bool {
 containers, err := pool.Client.ListContainers(docker.ListContainersOptions{All: true})
 if err != nil {
 t.Logf("Error listing containers: %v", err)
 return false
 }

 for _, c := range containers {
 t.Logf("Found container: %s with labels: %v", c.ID[:12], c.Labels)
 if labelValue, ok := c.Labels["devcontainer.local_folder"]; ok {
 if labelValue == tempWorkspaceFolder {
 t.Logf("Found matching container: %s", c.ID[:12])
 container = c
 return true
 }
 }
 }

 return false
 }, testutil.WaitSuperLong, testutil.IntervalMedium, "no container with workspace folder label found")

 t.Cleanup(func() {
 // We can't rely on pool here because the container is not
 // managed by it (it is managed by @devcontainer/cli).
 err := pool.Client.RemoveContainer(docker.RemoveContainerOptions{
 ID:            container.ID,
 RemoveVolumes: true,
 Force:         true,
 })
 assert.NoError(t, err, "remove container")
 })

 containerInfo, err := pool.Client.InspectContainer(container.ID)
 require.NoError(t, err, "inspect container")
 t.Logf("Container state: status: %v", containerInfo.State.Status)
 require.True(t, containerInfo.State.Running, "container should be running")

 ac, err := conn.ReconnectingPTY(ctx, uuid.New(), 80, 80, "", func(opts *workspacesdk.AgentReconnectingPTYInit) {
 opts.Container = container.ID
 })
 require.NoError(t, err, "failed to create ReconnectingPTY")
 defer ac.Close()

 // Use terminal reader so we can see output in case somethin goes wrong.
 tr := testutil.NewTerminalReader(t, ac)

 require.NoError(t, tr.ReadUntil(ctx, func(line string) bool {
 return strings.Contains(line, "#") || strings.Contains(line, "$")
 }), "find prompt")

 wantFileName := "file-from-devcontainer"
 wantFile := filepath.Join(tempWorkspaceFolder, wantFileName)

 require.NoError(t, json.NewEncoder(ac).Encode(workspacesdk.ReconnectingPTYRequest{
 // NOTE(mafredri): We must use absolute path here for some reason.
 Data: fmt.Sprintf("touch /workspaces/mywork/%s; exit\r", wantFileName),
 }), "create file inside devcontainer")

 // Wait for the connection to close to ensure the touch was executed.
 require.ErrorIs(t, tr.ReadUntil(ctx, nil), io.EOF)

 _, err = os.Stat(wantFile)
 require.NoError(t, err, "file should exist outside devcontainer")
 }

 func TestAgent_Dial(t *testing.T) {
 t.Parallel()

diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go
 package agentcontainers

 import (
 "context"
 "fmt"
 "os"
 "path/filepath"
 "strings"

 "cdr.dev/slog"

 "github.com/coder/coder/v2/codersdk"
 )

 const devcontainerUpScriptTemplate = `
 if ! which devcontainer > /dev/null 2>&1; then
  echo "ERROR: Unable to start devcontainer, @devcontainers/cli is not installed."
  exit 1
 fi
 devcontainer up %s
 `

 // ExtractAndInitializeDevcontainerScripts extracts devcontainer scripts from
 // the given scripts and devcontainers. The devcontainer scripts are removed
 // from the returned scripts so that they can be run separately.
 //
 // Dev Containers have an inherent dependency on start scripts, since they
 // initialize the workspace (e.g. git clone, npm install, etc). This is
 // important if e.g. a Coder module to install @devcontainer/cli is used.
 func ExtractAndInitializeDevcontainerScripts(
 logger slog.Logger,
 expandPath func(string) (string, error),
 devcontainers []codersdk.WorkspaceAgentDevcontainer,
 scripts []codersdk.WorkspaceAgentScript,
 ) (filteredScripts []codersdk.WorkspaceAgentScript, devcontainerScripts []codersdk.WorkspaceAgentScript) {
 ScriptLoop:
 for _, script := range scripts {
 for _, dc := range devcontainers {
 // The devcontainer scripts match the devcontainer ID for
 // identification.
 if script.ID == dc.ID {
 dc = expandDevcontainerPaths(logger, expandPath, dc)
 devcontainerScripts = append(devcontainerScripts, devcontainerStartupScript(dc, script))
 continue ScriptLoop
 }
 }

 filteredScripts = append(filteredScripts, script)
 }

 return filteredScripts, devcontainerScripts
 }

 func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script codersdk.WorkspaceAgentScript) codersdk.WorkspaceAgentScript {
 var args []string
 args = append(args, fmt.Sprintf("--workspace-folder %q", dc.WorkspaceFolder))
 if dc.ConfigPath != "" {
 args = append(args, fmt.Sprintf("--config %q", dc.ConfigPath))
 }
 cmd := fmt.Sprintf(devcontainerUpScriptTemplate, strings.Join(args, " "))
 script.Script = cmd
 // Disable RunOnStart, scripts have this set so that when devcontainers
 // have not been enabled, a warning will be surfaced in the agent logs.
 script.RunOnStart = false
 return script
 }

 func expandDevcontainerPaths(logger slog.Logger, expandPath func(string) (string, error), dc codersdk.WorkspaceAgentDevcontainer) codersdk.WorkspaceAgentDevcontainer {
 logger = logger.With(slog.F("devcontainer", dc.Name), slog.F("workspace_folder", dc.WorkspaceFolder), slog.F("config_path", dc.ConfigPath))

 if wf, err := expandPath(dc.WorkspaceFolder); err != nil {
 logger.Warn(context.Background(), "expand devcontainer workspace folder failed", slog.Error(err))
 } else {
 dc.WorkspaceFolder = wf
 }
 if dc.ConfigPath != "" {
 // Let expandPath handle home directory, otherwise assume relative to
 // workspace folder or absolute.
 if dc.ConfigPath[0] == '~' {
 if cp, err := expandPath(dc.ConfigPath); err != nil {
 logger.Warn(context.Background(), "expand devcontainer config path failed", slog.Error(err))
 } else {
 dc.ConfigPath = cp
 }
 } else {
 dc.ConfigPath = relativePathToAbs(dc.WorkspaceFolder, dc.ConfigPath)
 }
 }
 return dc
 }

 func relativePathToAbs(workdir, path string) string {
 path = os.ExpandEnv(path)
 if !filepath.IsAbs(path) {
 path = filepath.Join(workdir, path)
 }
 return path
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1075,7 +1075,7 @@ func (a agent) handleManifest(manifestOK checkpoint) func(ctx context.Context,
		//
		// An example is VS Code Remote, which must know the directory
		// before initializing a connection.
		manifest.Directory, err =expandDirectory(manifest.Directory)
		manifest.Directory, err =expandPathToAbs(manifest.Directory)
		if err != nil {
		return xerrors.Errorf("expand directory: %w", err)
		}
Expand DownExpand Up		@@ -1115,16 +1115,35 @@ func (a agent) handleManifest(manifestOK checkpoint) func(ctx context.Context,
		}
		}

		err = a.scriptRunner.Init(manifest.Scripts, aAPI.ScriptCompleted)
		var (
		scripts = manifest.Scripts
		scriptRunnerOpts []agentscripts.InitOption
		)
		if a.experimentalDevcontainersEnabled {
		var dcScripts []codersdk.WorkspaceAgentScript
		scripts, dcScripts = agentcontainers.ExtractAndInitializeDevcontainerScripts(a.logger, expandPathToAbs, manifest.Devcontainers, scripts)
		// See ExtractAndInitializeDevcontainerScripts for motivation
		// behind running dcScripts as post start scripts.
		scriptRunnerOpts = append(scriptRunnerOpts, agentscripts.WithPostStartScripts(dcScripts...))
		}
		err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
		if err != nil {
		return xerrors.Errorf("init script runner: %w", err)
		}
		err = a.trackGoroutine(func() {
		start := time.Now()
		// here we use the graceful context because the script runner is not directly tied
		// to the agent API.
		// Here we use the graceful context because the script runner is
		// not directly tied to the agent API.
		//
		// First we run the start scripts to ensure the workspace has
		// been initialized and then the post start scripts which may
		// depend on the workspace start scripts.
		//
		// Measure the time immediately after the start scripts have
		// finished (both start and post start). For instance, an
		// autostarted devcontainer will be included in this time.
		err := a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecuteStartScripts)
		// Measure the time immediately after the script has finished
		err = errors.Join(err, a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecutePostStartScripts))
		dur := time.Since(start).Seconds()
		if err != nil {
		a.logger.Warn(ctx, "startup script(s) failed", slog.Error(err))
Expand DownExpand Up		@@ -1846,30 +1865,29 @@ func userHomeDir() (string, error) {
		return u.HomeDir, nil
		}

		// expandDirectory converts a directory path to an absolute path.
		// It primarily resolves the home directory and any environment
		// variables that may be set
		func expandDirectory(dir string) (string, error) {
		if dir == "" {
		// expandPathToAbs converts a path to an absolute path. It primarily resolves
		// the home directory and any environment variables that may be set.
		func expandPathToAbs(path string) (string, error) {
		if path == "" {
		return "", nil
		}
		ifdir[0] == '~' {
		ifpath[0] == '~' {
		home, err := userHomeDir()
		if err != nil {
		return "", err
		}
		dir = filepath.Join(home,dir[1:])
		path = filepath.Join(home,path[1:])
		}
		dir = os.ExpandEnv(dir)
		path = os.ExpandEnv(path)

		if !filepath.IsAbs(dir) {
		if !filepath.IsAbs(path) {
		home, err := userHomeDir()
		if err != nil {
		return "", err
		}
		dir = filepath.Join(home,dir)
		path = filepath.Join(home,path)
		}
		returndir, nil
		returnpath, nil
		}

		// EnvAgentSubsystem is the environment variable used to denote the
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1937,6 +1937,134 @@ func TestAgent_ReconnectingPTYContainer(t *testing.T) {
		require.ErrorIs(t, tr.ReadUntil(ctx, nil), io.EOF)
		}

		// This tests end-to-end functionality of auto-starting a devcontainer.
		// It runs "devcontainer up" which creates a real Docker container. As
		// such, it does not run by default in CI.
		//
		// You can run it manually as follows:
		//
		// CODER_TEST_USE_DOCKER=1 go test -count=1 ./agent -run TestAgent_DevcontainerAutostart
		func TestAgent_DevcontainerAutostart(t *testing.T) {
mafredri marked this conversation as resolved. Show resolvedHide resolved
		t.Parallel()
		if os.Getenv("CODER_TEST_USE_DOCKER") != "1" {
		t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")
		}

		ctx := testutil.Context(t, testutil.WaitLong)

		// Connect to Docker
		pool, err := dockertest.NewPool("")
		require.NoError(t, err, "Could not connect to docker")

		// Prepare temporary devcontainer for test (mywork).
		devcontainerID := uuid.New()
		tempWorkspaceFolder := t.TempDir()
		tempWorkspaceFolder = filepath.Join(tempWorkspaceFolder, "mywork")
		t.Logf("Workspace folder: %s", tempWorkspaceFolder)
		devcontainerPath := filepath.Join(tempWorkspaceFolder, ".devcontainer")
		err = os.MkdirAll(devcontainerPath, 0o755)
		require.NoError(t, err, "create devcontainer directory")
		devcontainerFile := filepath.Join(devcontainerPath, "devcontainer.json")
		err = os.WriteFile(devcontainerFile, []byte(`{
		"name": "mywork",
		"image": "busybox:latest",
		"cmd": ["sleep", "infinity"]
		}`), 0o600)
		require.NoError(t, err, "write devcontainer.json")

		manifest := agentsdk.Manifest{
		// Set up pre-conditions for auto-starting a devcontainer, the script
		// is expected to be prepared by the provisioner normally.
		Devcontainers: []codersdk.WorkspaceAgentDevcontainer{
		{
		ID: devcontainerID,
		Name: "test",
		WorkspaceFolder: tempWorkspaceFolder,
		},
		},
		Scripts: []codersdk.WorkspaceAgentScript{
		{
		ID: devcontainerID,
		LogSourceID: agentsdk.ExternalLogSourceID,
		RunOnStart: true,
		Script: "echo this-will-be-replaced",
		DisplayName: "Dev Container (test)",
		},
		},
		}
		// nolint: dogsled
		conn, _, _, _, _ := setupAgent(t, manifest, 0, func(_ agenttest.Client, o agent.Options) {
		o.ExperimentalDevcontainersEnabled = true
		})

		t.Logf("Waiting for container with label: devcontainer.local_folder=%s", tempWorkspaceFolder)

		var container docker.APIContainers
		require.Eventually(t, func() bool {
		containers, err := pool.Client.ListContainers(docker.ListContainersOptions{All: true})
		if err != nil {
		t.Logf("Error listing containers: %v", err)
		return false
		}

		for _, c := range containers {
		t.Logf("Found container: %s with labels: %v", c.ID[:12], c.Labels)
		if labelValue, ok := c.Labels["devcontainer.local_folder"]; ok {
		if labelValue == tempWorkspaceFolder {
		t.Logf("Found matching container: %s", c.ID[:12])
		container = c
		return true
		}
		}
		}

		return false
		}, testutil.WaitSuperLong, testutil.IntervalMedium, "no container with workspace folder label found")

		t.Cleanup(func() {
		// We can't rely on pool here because the container is not
		// managed by it (it is managed by @devcontainer/cli).
		err := pool.Client.RemoveContainer(docker.RemoveContainerOptions{
		ID: container.ID,
		RemoveVolumes: true,
		Force: true,
		})
		assert.NoError(t, err, "remove container")
		})

		containerInfo, err := pool.Client.InspectContainer(container.ID)
		require.NoError(t, err, "inspect container")
		t.Logf("Container state: status: %v", containerInfo.State.Status)
		require.True(t, containerInfo.State.Running, "container should be running")

		ac, err := conn.ReconnectingPTY(ctx, uuid.New(), 80, 80, "", func(opts *workspacesdk.AgentReconnectingPTYInit) {
		opts.Container = container.ID
		})
		require.NoError(t, err, "failed to create ReconnectingPTY")
		defer ac.Close()

		// Use terminal reader so we can see output in case somethin goes wrong.
		tr := testutil.NewTerminalReader(t, ac)

		require.NoError(t, tr.ReadUntil(ctx, func(line string) bool {
		return strings.Contains(line, "#") \|\| strings.Contains(line, "$")
		}), "find prompt")

		wantFileName := "file-from-devcontainer"
		wantFile := filepath.Join(tempWorkspaceFolder, wantFileName)

		require.NoError(t, json.NewEncoder(ac).Encode(workspacesdk.ReconnectingPTYRequest{
		// NOTE(mafredri): We must use absolute path here for some reason.
		Data: fmt.Sprintf("touch /workspaces/mywork/%s; exit\r", wantFileName),
		}), "create file inside devcontainer")

		// Wait for the connection to close to ensure the touch was executed.
		require.ErrorIs(t, tr.ReadUntil(ctx, nil), io.EOF)

		_, err = os.Stat(wantFile)
		require.NoError(t, err, "file should exist outside devcontainer")
		}

		func TestAgent_Dial(t *testing.T) {
		t.Parallel()

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,98 @@
		package agentcontainers

		import (
		"context"
		"fmt"
		"os"
		"path/filepath"
		"strings"

		"cdr.dev/slog"

		"github.com/coder/coder/v2/codersdk"
		)

		const devcontainerUpScriptTemplate = `
		if ! which devcontainer > /dev/null 2>&1; then
		echo "ERROR: Unable to start devcontainer, @devcontainers/cli is not installed."
		exit 1
		fi
		devcontainer up %s
		`

		// ExtractAndInitializeDevcontainerScripts extracts devcontainer scripts from
		// the given scripts and devcontainers. The devcontainer scripts are removed
		// from the returned scripts so that they can be run separately.
		//
		// Dev Containers have an inherent dependency on start scripts, since they
		// initialize the workspace (e.g. git clone, npm install, etc). This is
		// important if e.g. a Coder module to install @devcontainer/cli is used.
		func ExtractAndInitializeDevcontainerScripts(
		logger slog.Logger,
		expandPath func(string) (string, error),
		devcontainers []codersdk.WorkspaceAgentDevcontainer,
		scripts []codersdk.WorkspaceAgentScript,
		) (filteredScripts []codersdk.WorkspaceAgentScript, devcontainerScripts []codersdk.WorkspaceAgentScript) {
		ScriptLoop:
		for _, script := range scripts {
		for _, dc := range devcontainers {
		// The devcontainer scripts match the devcontainer ID for
		// identification.
		if script.ID == dc.ID {
		dc = expandDevcontainerPaths(logger, expandPath, dc)
		devcontainerScripts = append(devcontainerScripts, devcontainerStartupScript(dc, script))
		continue ScriptLoop
		}
		}

		filteredScripts = append(filteredScripts, script)
		}

		return filteredScripts, devcontainerScripts
		}

		func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script codersdk.WorkspaceAgentScript) codersdk.WorkspaceAgentScript {
		var args []string
		args = append(args, fmt.Sprintf("--workspace-folder %q", dc.WorkspaceFolder))
		if dc.ConfigPath != "" {
		args = append(args, fmt.Sprintf("--config %q", dc.ConfigPath))
		}
		cmd := fmt.Sprintf(devcontainerUpScriptTemplate, strings.Join(args, " "))
		script.Script = cmd
		// Disable RunOnStart, scripts have this set so that when devcontainers
		// have not been enabled, a warning will be surfaced in the agent logs.
		script.RunOnStart = false
		return script
		}

		func expandDevcontainerPaths(logger slog.Logger, expandPath func(string) (string, error), dc codersdk.WorkspaceAgentDevcontainer) codersdk.WorkspaceAgentDevcontainer {
		logger = logger.With(slog.F("devcontainer", dc.Name), slog.F("workspace_folder", dc.WorkspaceFolder), slog.F("config_path", dc.ConfigPath))

		if wf, err := expandPath(dc.WorkspaceFolder); err != nil {
		logger.Warn(context.Background(), "expand devcontainer workspace folder failed", slog.Error(err))
mafredri marked this conversation as resolved. Show resolvedHide resolved
		} else {
		dc.WorkspaceFolder = wf
		}
		if dc.ConfigPath != "" {
		// Let expandPath handle home directory, otherwise assume relative to
		// workspace folder or absolute.
		if dc.ConfigPath[0] == '~' {
		if cp, err := expandPath(dc.ConfigPath); err != nil {
		logger.Warn(context.Background(), "expand devcontainer config path failed", slog.Error(err))
		} else {
		dc.ConfigPath = cp
		}
		} else {
		dc.ConfigPath = relativePathToAbs(dc.WorkspaceFolder, dc.ConfigPath)
		}
		}
		return dc
		}

		func relativePathToAbs(workdir, path string) string {
		path = os.ExpandEnv(path)
		if !filepath.IsAbs(path) {
		path = filepath.Join(workdir, path)
		}
		return path
		}