chore: include merged, com.coder to coder, UnmarshallJSON

DanielleMaywood · DanielleMaywood · commit d06023f1bf05 · 2025-06-12T19:09:50.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -1131,7 +1131,7 @@ func (api *API) injectSubAgentIntoContainerLocked(ctx context.Context, dc coders
 	); err != nil {
 		api.logger.Error(ctx, "unable to read devcontainer config", slog.Error(err))
 	} else {
-		coderCustomization := config.Configuration.Customizations.Coder
+		coderCustomization := config.MergedConfiguration.Customizations.Coder
 		if coderCustomization != nil {
 			displayApps = coderCustomization.DisplayApps
 			apps = coderCustomization.Apps
diff --git a/agent/agentcontainers/api_test.go b/agent/agentcontainers/api_test.go
@@ -1572,7 +1572,7 @@ func TestAPI(t *testing.T) {
 					fSAC   = &fakeSubAgentClient{createErrC: make(chan error, 1)}
 					fDCCLI = &fakeDevcontainerCLI{
 						readConfig: agentcontainers.DevcontainerConfig{
-							Configuration: agentcontainers.DevcontainerConfiguration{
+							MergedConfiguration: agentcontainers.DevcontainerConfiguration{
 								Customizations: agentcontainers.DevcontainerCustomizations{
 									Coder: tt.customization,
 								},
diff --git a/agent/agentcontainers/devcontainercli.go b/agent/agentcontainers/devcontainercli.go
@@ -19,15 +19,15 @@ import (
 // Unfortunately we cannot make use of `dcspec` as the output doesn't appear to
 // match.
 type DevcontainerConfig struct {
-	Configuration DevcontainerConfiguration `json:"configuration"`
+	MergedConfiguration DevcontainerConfiguration `json:"mergedConfiguration"`
 }
 
 type DevcontainerConfiguration struct {
 	Customizations DevcontainerCustomizations `json:"customizations,omitempty"`
 }
 
 type DevcontainerCustomizations struct {
-	Coder *CoderCustomization `json:"com.coder,omitempty"`
+	Coder *CoderCustomization `json:"coder,omitempty"`
 }
 
 type CoderCustomization struct {
@@ -197,23 +197,17 @@ func (d *devcontainerCLI) Up(ctx context.Context, workspaceFolder, configPath st
 	cmd.Stderr = io.MultiWriter(stderrWriters...)
 
 	if err := cmd.Run(); err != nil {
-		result, err2 := parseDevcontainerCLILastLine[devcontainerCLIResult](ctx, logger, stdoutBuf.Bytes())
+		_, err2 := parseDevcontainerCLILastLine[devcontainerCLIResult](ctx, logger, stdoutBuf.Bytes())
 		if err2 != nil {
 			err = errors.Join(err, err2)
 		}
-		if err2 := result.Err(); err2 != nil {
-			err = errors.Join(err, err2)
-		}
 		return "", err
 	}
 
 	result, err := parseDevcontainerCLILastLine[devcontainerCLIResult](ctx, logger, stdoutBuf.Bytes())
 	if err != nil {
 		return "", err
 	}
-	if err := result.Err(); err != nil {
-		return "", err
-	}
 
 	return result.ContainerID, nil
 }
@@ -261,7 +255,7 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi
 	conf := applyDevcontainerCLIReadConfigOptions(opts)
 	logger := d.logger.With(slog.F("workspace_folder", workspaceFolder), slog.F("config_path", configPath))
 
-	args := []string{"read-configuration"}
+	args := []string{"read-configuration", "--include-merged-configuration"}
 	if workspaceFolder != "" {
 		args = append(args, "--workspace-folder", workspaceFolder)
 	}
@@ -341,6 +335,18 @@ type devcontainerCLIResult struct {
 	Description string `json:"description"`
 }
 
+func (r *devcontainerCLIResult) UnmarshalJSON(data []byte) error {
+	type wrapperResult devcontainerCLIResult
+
+	var wrappedResult wrapperResult
+	if err := json.Unmarshal(data, &wrappedResult); err != nil {
+		return err
+	}
+
+	*r = devcontainerCLIResult(wrappedResult)
+	return r.Err()
+}
+
 func (r devcontainerCLIResult) Err() error {
 	if r.Outcome == "success" {
 		return nil
diff --git a/agent/agentcontainers/devcontainercli_test.go b/agent/agentcontainers/devcontainercli_test.go
@@ -253,10 +253,10 @@ func TestDevcontainerCLI_ArgsAndParsing(t *testing.T) {
 				logFile:         "read-config-with-coder-customization.log",
 				workspaceFolder: "/test/workspace",
 				configPath:      "",
-				wantArgs:        "read-configuration --workspace-folder /test/workspace",
+				wantArgs:        "read-configuration --include-merged-configuration --workspace-folder /test/workspace",
 				wantError:       false,
 				wantConfig: agentcontainers.DevcontainerConfig{
-					Configuration: agentcontainers.DevcontainerConfiguration{
+					MergedConfiguration: agentcontainers.DevcontainerConfiguration{
 						Customizations: agentcontainers.DevcontainerCustomizations{
 							Coder: &agentcontainers.CoderCustomization{
 								DisplayApps: []codersdk.DisplayApp{
@@ -273,10 +273,10 @@ func TestDevcontainerCLI_ArgsAndParsing(t *testing.T) {
 				logFile:         "read-config-without-coder-customization.log",
 				workspaceFolder: "/test/workspace",
 				configPath:      "/test/config.json",
-				wantArgs:        "read-configuration --workspace-folder /test/workspace --config /test/config.json",
+				wantArgs:        "read-configuration --include-merged-configuration --workspace-folder /test/workspace --config /test/config.json",
 				wantError:       false,
 				wantConfig: agentcontainers.DevcontainerConfig{
-					Configuration: agentcontainers.DevcontainerConfiguration{
+					MergedConfiguration: agentcontainers.DevcontainerConfiguration{
 						Customizations: agentcontainers.DevcontainerCustomizations{
 							Coder: nil,
 						},
@@ -288,7 +288,7 @@ func TestDevcontainerCLI_ArgsAndParsing(t *testing.T) {
 				logFile:         "read-config-error-not-found.log",
 				workspaceFolder: "/nonexistent/workspace",
 				configPath:      "",
-				wantArgs:        "read-configuration --workspace-folder /nonexistent/workspace",
+				wantArgs:        "read-configuration --include-merged-configuration --workspace-folder /nonexistent/workspace",
 				wantError:       true,
 				wantConfig:      agentcontainers.DevcontainerConfig{},
 			},
diff --git a/agent/agentcontainers/testdata/devcontainercli/readconfig/read-config-with-coder-customization.log b/agent/agentcontainers/testdata/devcontainercli/readconfig/read-config-with-coder-customization.log
diff --git a/agent/agentcontainers/testdata/devcontainercli/readconfig/read-config-without-coder-customization.log b/agent/agentcontainers/testdata/devcontainercli/readconfig/read-config-without-coder-customization.log
