Skip to content
Merged
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
13 changes: 5 additions & 8 deletions cmd/workspace/troubleshoot.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,11 @@ func collectWorkspacePlatformTroubleshoot(
return nil, nil
}

return collectProWorkspaceInfo(
return collectPlatformWorkspaceInfo(
ctx,
devsyConfig,
platformInstance.Host,
ws.UID,
ws.Platform.Project,
platform.FindInstanceOptions{UID: ws.UID, ProjectName: ws.Platform.Project},
)
}

Expand All @@ -191,22 +190,20 @@ func collectDaemonStatus(
return &status, nil
}

// collectProWorkspaceInfo collects troubleshooting information for a Devsy Pro instance.
// collectPlatformWorkspaceInfo collects troubleshooting information for a Devsy Platform instance.
// It initializes a client from the host, finds the workspace instance in the project, and retrieves
// troubleshooting information using the management client.
func collectProWorkspaceInfo(
func collectPlatformWorkspaceInfo(
ctx context.Context,
devsyConfig *config.Config,
host string,
workspaceUID string,
project string,
opts platform.FindInstanceOptions,
) (*managementv1.DevsyWorkspaceInstanceTroubleshoot, error) {
baseClient, err := platform.InitClientFromHost(ctx, devsyConfig, host)
if err != nil {
return nil, fmt.Errorf("init client from host: %w", err)
}

opts := platform.FindInstanceOptions{UID: workspaceUID, ProjectName: project}
workspace, err := platform.FindInstance(ctx, baseClient, opts)
if err != nil {
return nil, err
Expand Down
Loading