Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ func resolveMergedWorkspaceFolder(

result, err := provider.LoadWorkspaceResult(workspaceConfig.Context, workspaceConfig.ID)
if err != nil {
log.Debugf("Error loading workspace result for workdir resolution: %v", err)
log.Warnf("Error loading workspace result for workdir resolution: %v", err)
return ""
}
if result == nil || result.MergedConfig == nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/loftconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func AuthDevsyCliToPlatform(config *client.Config) error {
out, err := cmd.CombinedOutput()
if err != nil {
log.Debugf(
"Failed executing `%s pro login`: %w, output: %s",
"Failed executing `%s pro login`: %v, output: %s",
pkgconfig.BinaryName,
err,
out,
Expand All @@ -47,7 +47,7 @@ func AuthVClusterCliToPlatform(config *client.Config) error {
cmd := exec.Command("vcluster", "login", "--access-key", config.AccessKey, config.Host)
out, err := cmd.CombinedOutput()
if err != nil {
log.Debugf("Failed executing `vcluster login` : %w, output: %s", err, out)
log.Debugf("Failed executing `vcluster login` : %v, output: %s", err, out)
return fmt.Errorf("error executing 'vcluster login' command: %w", err)
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/workspace/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,10 @@ func resolveWorkspace(
// check if we have no args
if len(params.Args) == 0 {
if params.DesiredID != "" {
workspace, _ := findWorkspace(ctx, devsyConfig, nil, params.DesiredID, params.Owner)
workspace, err := findWorkspace(ctx, devsyConfig, nil, params.DesiredID, params.Owner)
if err != nil {
return nil, nil, nil, fmt.Errorf("find workspace: %w", err)
}
if workspace == nil {
return nil, nil, nil, fmt.Errorf("workspace %s doesn't exist", params.DesiredID)
}
Expand Down
Loading