10000 feat(agent/agentcontainers): support displayApps from devcontainer config by DanielleMaywood · Pull Request #18342 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat(agent/agentcontainers): support displayApps from devcontainer config #18342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 12, 2025
Merged

feat(agent/agentcontainers): support displayApps from devcontainer config #18342

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b44a89
feat(agent/agentcontainers): support displayApps from devcontainer co…
DanielleMaywood Jun 12, 2025
e12ccc7
chore: appease linter and remove duplicated test
DanielleMaywood Jun 12, 2025
4b6209e
chore: listen to feedback
DanielleMaywood Jun 12, 2025
aa77e9e
chore: include merged, com.coder to coder, UnmarshallJSON
DanielleMaywood Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
10000
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: listen to feedback
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Jun 12, 2025
commit 4b6209e17c368ae9efb018b5f65a88963a465fc6
24 changes: 13 additions & 11 deletions agent/agentcontainers/devcontainercli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ func (d *devcontainerCLI) Up(ctx context.Context, workspaceFolder, configPath st
cmd.Stderr = io.MultiWriter(stderrWriters...)

if err := cmd.Run(); err != nil {
var result devcontainerCLIResult
if err2 := parseDevcontainerCLILastLine(ctx, logger, stdoutBuf.Bytes(), &result); err2 != nil {
result, err2 := parseDevcontainerCLILastLine[devcontainerCLIResult](ctx, logger, stdoutBuf.Bytes())
if err2 != nil {
err = errors.Join(err, err2)
}
if err2 := result.Err(); err2 != nil {
Expand All @@ -206,8 +206,8 @@ func (d *devcontainerCLI) Up(ctx context.Context, workspaceFolder, configPath st
return "", err
}

var result devcontainerCLIResult
if err := parseDevcontainerCLILastLine(ctx, logger, stdoutBuf.Bytes(), &result); err != nil {
result, err := parseDevcontainerCLILastLine[devcontainerCLIResult](ctx, logger, stdoutBuf.Bytes())
if err != nil {
return "", err
}
if err := result.Err(); err != nil {
Expand Down Expand Up @@ -286,8 +286,8 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi
return DevcontainerConfig{}, xerrors.Errorf("devcontainer read-configuration failed: %w", err)
}

var config DevcontainerConfig
if err := parseDevcontainerCLILastLine(ctx, logger, stdoutBuf.Bytes(), &config); err != nil {
config, err := parseDevcontainerCLILastLine[DevcontainerConfig](ctx, logger, stdoutBuf.Bytes())
if err != nil {
return DevcontainerConfig{}, err
}

Expand All @@ -296,7 +296,9 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi

// parseDevcontainerCLILastLine parses the last line of the devcontainer CLI output
// which is a JSON object.
func parseDevcontainerCLILastLine[T any](ctx context.Context, logger slog.Logger, p []byte, result T) error {
func parseDevcontainerCLILastLine[T any](ctx context.Context, logger slog.Logger, p []byte) (T, error) {
var result T

s := bufio.NewScanner(bytes.NewReader(p))
var lastLine []byte
for s.Scan() {
Expand All @@ -307,18 +309,18 @@ func parseDevcontainerCLILastLine[T any](ctx context.Context, logger slog.Logger
lastLine = b
}
if err := s.Err(); err != nil {
return err
return result, err
}
if len(lastLine) == 0 || lastLine[0] != '{' {
logger.Error(ctx, "devcontainer result is not json", slog.F("result", string(lastLine)))
return xerrors.Errorf("devcontainer result is not json: %q", string(lastLine))
return result, xerrors.Errorf("devcontainer result is not json: %q", string(lastLine))
}
if err := json.Unmarshal(lastLine, &result); err != nil {
logger.Error(ctx, "parse devcontainer result failed", slog.Error(err), slog.F("result", string(lastLine)))
return err
return result, err
}

return nil
return result, nil
}

// devcontainerCLIResult is the result of the devcontainer CLI command.
Expand Down
Loading
0