Skip to content

Use WithWorkspace in setup server so tunnelserver.workspace is not nil #1814

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use WithWorkspace in setup server so tunnelserver.workspace is not nil #1814

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
3 changes: 2 additions & 1 deletion pkg/agent/tunnelserver/tunnelserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ func RunUpServer(ctx context.Context, reader io.Reader, writer io.WriteCloser, a
return tunnelServ.RunWithResult(ctx, reader, writer)
}

func RunSetupServer(ctx context.Context, reader io.Reader, writer io.WriteCloser, allowGitCredentials, allowDockerCredentials bool, mounts []*config.Mount, log log.Logger, options ...Option) (*config.Result, error) {
func RunSetupServer(ctx context.Context, reader io.Reader, writer io.WriteCloser, allowGitCredentials, allowDockerCredentials bool, mounts []*config.Mount, workspace *provider2.Workspace, log log.Logger, options ...Option) (*config.Result, error) {
opts := append(options, []Option{
WithMounts(mounts),
WithWorkspace(workspace),
WithAllowGitCredentials(allowGitCredentials),
WithAllowDockerCredentials(allowDockerCredentials),
WithAllowKubeConfig(true),
Expand Down
1 change: 1 addition & 0 deletions pkg/devcontainer/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ func (r *runner) setupContainer(
r.WorkspaceConfig.Agent.InjectGitCredentials != "false",
r.WorkspaceConfig.Agent.InjectDockerCredentials != "false",
config.GetMounts(result),
r.WorkspaceConfig.Workspace,
r.Log,
tunnelserver.WithPlatformOptions(&r.WorkspaceConfig.CLIOptions.Platform),
)
Expand Down
Loading