Skip to content

Commit 52459a9

Browse files
Fix workspace daemon package imports
1 parent a37b7c9 commit 52459a9

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

pkg/daemon/workspace/daemon.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"syscall"
1313
"time"
1414

15-
workspaced "github.com/loft-sh/devpod/pkg/daemon/workspace"
1615
"github.com/loft-sh/devpod/pkg/devcontainer/config"
1716
"github.com/loft-sh/log"
1817
"github.com/pkg/errors"
@@ -145,7 +144,7 @@ func (cmd *Daemon) loadConfig() error {
145144
if err != nil {
146145
return fmt.Errorf("error decoding daemon config: %w", err)
147146
}
148-
var cfg workspaced.DaemonConfig
147+
var cfg DaemonConfig
149148
if err = json.Unmarshal(decoded, &cfg); err != nil {
150149
return fmt.Errorf("error unmarshalling daemon config: %w", err)
151150
}

pkg/devcontainer/single.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (r *runner) runSingleContainer(
131131
if options.CLIOptions.Platform.AccessKey != "" {
132132
r.Log.Debugf("Platform config detected, injecting DevPod daemon entrypoint.")
133133

134-
data, err := workspaced.GetEncodedDaemonConfig(options.Platform, r.WorkspaceConfig.Workspace, substitutionContext, mergedConfig)
134+
data, err := workspaced.GetEncodedWorkspaceDaemonConfig(options.Platform, r.WorkspaceConfig.Workspace, substitutionContext, mergedConfig)
135135
if err != nil {
136136
r.Log.Errorf("Failed to marshal daemon config: %v", err)
137137
} else {

0 commit comments

Comments
 (0)