Skip to content

fix(daemon): remove hardcoded ShutdownAction fallback, trust merge layer #286

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
skevetter merged 1 commit into from
May 14, 2026
Merged

fix(daemon): remove hardcoded ShutdownAction fallback, trust merge layer #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkg/daemon/agent/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ func BuildWorkspaceDaemonConfig(
// build info isn't required in the workspace and can be omitted
platformOptions.Build = nil

shutdownAction := config.ShutdownActionStopContainer
if mergedConfig.ShutdownAction != "" {
shutdownAction = mergedConfig.ShutdownAction
}
shutdownAction := mergedConfig.ShutdownAction

daemonConfig := &DaemonConfig{
Platform: platformOptions,
Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/agent/daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ func TestBuildWorkspaceDaemonConfig_ShutdownAction(t *testing.T) {
want string
}{
{
name: "defaults to stopContainer when empty",
name: "passes through empty value from merged config",
shutdownAction: "",
want: config.ShutdownActionStopContainer,
want: "",
},
{
name: "preserves none",
Expand Down
Loading