Skip to content
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

Jump to bottom

Rename ide url #414

Merged
merged 2 commits into from
Apr 27, 2021
Merged

Rename ide url #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6f95a
Rename ideUrl to mainUrl
amisevsk Apr 20, 2021
3a94791
Regenerate CRDs and schemas after renaming ideUrl
amisevsk Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7444,8 +7444,8 @@ spec:
devworkspaceId:
description: Id of the DevWorkspace
type: string
ideUrl:
description: URL at which the DevWorkspace Editor can be joined
mainUrl:
description: Main URL for this DevWorkspace
type: string
message:
description: Message is a short user-readable message giving additional
Expand Down
4 changes: 2 additions & 2 deletions crds/workspace.devfile.io_devworkspaces.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7449,8 +7449,8 @@ spec:
devworkspaceId:
description: Id of the DevWorkspace
type: string
ideUrl:
description: URL at which the DevWorkspace Editor can be joined
mainUrl:
description: Main URL for this DevWorkspace
type: string
message:
description: Message is a short user-readable message giving additional
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/workspaces/v1alpha1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
func convertDevWorkspaceTo_v1alpha2(src *DevWorkspace, dest *v1alpha2.DevWorkspace) error {
dest.ObjectMeta = src.ObjectMeta
dest.Status.DevWorkspaceId = src.Status.WorkspaceId
dest.Status.IdeUrl = src.Status.IdeUrl
dest.Status.MainUrl = src.Status.IdeUrl
dest.Status.Phase = v1alpha2.DevWorkspacePhase(src.Status.Phase)
dest.Status.Message = src.Status.Message
convertConditionsTo_v1alpha2(src, dest)
Expand All @@ -20,7 +20,7 @@ func convertDevWorkspaceTo_v1alpha2(src *DevWorkspace, dest *v1alpha2.DevWorkspa
func convertDevWorkspaceFrom_v1alpha2(src *v1alpha2.DevWorkspace, dest *DevWorkspace) error {
dest.ObjectMeta = src.ObjectMeta
dest.Status.WorkspaceId = src.Status.DevWorkspaceId
dest.Status.IdeUrl = src.Status.IdeUrl
dest.Status.IdeUrl = src.Status.MainUrl
dest.Status.Phase = WorkspacePhase(src.Status.Phase)
dest.Status.Message = src.Status.Message
convertConditionsFrom_v1alpha2(src, dest)
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/workspaces/v1alpha2/devworkspace_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type DevWorkspaceSpec struct {
type DevWorkspaceStatus struct {
// Id of the DevWorkspace
DevWorkspaceId string `json:"devworkspaceId"`
// URL at which the DevWorkspace Editor can be joined
IdeUrl string `json:"ideUrl,omitempty"`
Phase DevWorkspacePhase `json:"phase,omitempty"`
// Main URL for this DevWorkspace
MainUrl string `json:"mainUrl,omitempty"`
Phase DevWorkspacePhase `json:"phase,omitempty"`
// Conditions represent the latest available observations of an object's state
Conditions []DevWorkspaceCondition `json:"conditions,omitempty"`
// Message is a short user-readable message giving additional information
Expand Down
4 changes: 2 additions & 2 deletions schemas/latest/dev-workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3294,8 +3294,8 @@
"description": "Id of the DevWorkspace",
"type": "string"
},
"ideUrl": {
"description": "URL at which the DevWorkspace Editor can be joined",
"mainUrl": {
"description": "Main URL for this DevWorkspace",
"type": "string"
},
"message": {
Expand Down
6 changes: 3 additions & 3 deletions schemas/latest/ide-targeted/dev-workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3683,10 +3683,10 @@
"type": "string",
"markdownDescription": "Id of the DevWorkspace"
},
"ideUrl": {
"description": "URL at which the DevWorkspace Editor can be joined",
"mainUrl": {
"description": "Main URL for this DevWorkspace",
"type": "string",
"markdownDescription": "URL at which the DevWorkspace Editor can be joined"
"markdownDescription": "Main URL for this DevWorkspace"
},
"message": {
"description": "Message is a short user-readable message giving additional information about an object's state",
Expand Down