Skip to content

[public-api] align context url with server #18292

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
merged 4 commits into from
Jul 20, 2023
Merged

[public-api] align context url with server #18292

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e0c605
[public-api] align context url with server
mustard-mh Jul 17, 2023
c302bb2
:lipstick:
mustard-mh Jul 17, 2023
b786e97
update test case
mustard-mh Jul 17, 2023
6d777e8
Update test case
mustard-mh Jul 17, 2023
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
8 changes: 7 additions & 1 deletion components/public-api-server/pkg/apiv1/workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,18 @@ func convertWorkspaceInfo(input *protocol.WorkspaceInfo) (*v1.Workspace, error)
if err != nil {
return nil, err
}
// Align to https://github.com/gitpod-io/gitpod/blob/0bb6aaad9d4923d5510de865437f22c7f726833f/components/server/src/workspace/workspace-starter.ts#L1375-L1378
contextUrl := input.Workspace.ContextURL
if input.Workspace.Context != nil && len(input.Workspace.Context.NormalizedContextURL) > 0 {
contextUrl = input.Workspace.Context.NormalizedContextURL
}

return &v1.Workspace{
WorkspaceId: input.Workspace.ID,
OwnerId: input.Workspace.OwnerID,
ProjectId: "",
Context: &v1.WorkspaceContext{
ContextUrl: input.Workspace.ContextURL,
ContextUrl: contextUrl,
Details: &v1.WorkspaceContext_Git_{Git: &v1.WorkspaceContext_Git{
NormalizedContextUrl: input.Workspace.ContextURL,
Commit: "",
Expand Down