remove vscodetask and vscodelaunch, deprecate project.github

Signed-off-by: Stephanie <yangcao@redhat.com>
devfile · Feb 17, 2021 · 74bfc92 · 74bfc92
1 parent 283b0c5
commit 74bfc92
Show file tree

Hide file tree

Showing 47 changed files with 151 additions and 6,757 deletions.
diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml
diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml
diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml
diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml
diff --git a/pkg/apis/workspaces/v1alpha2/commands.go b/pkg/apis/workspaces/v1alpha2/commands.go
@@ -7,14 +7,12 @@ import (
 
 // CommandType describes the type of command.
 // Only one of the following command type may be specified.
-// +kubebuilder:validation:Enum=Exec;Apply;VscodeTask;VscodeLaunch;Composite;Custom
+// +kubebuilder:validation:Enum=Exec;Apply;Composite;Custom
 type CommandType string
 
 const (
 	ExecCommandType         CommandType = "Exec"
 	ApplyCommandType        CommandType = "Apply"
-	VscodeTaskCommandType   CommandType = "VscodeTask"
-	VscodeLaunchCommandType CommandType = "VscodeLaunch"
 	CompositeCommandType    CommandType = "Composite"
 	CustomCommandType       CommandType = "Custom"
 )
@@ -92,14 +90,6 @@ type CommandUnion struct {
 	// +optional
 	Apply *ApplyCommand `json:"apply,omitempty"`
 
-	// Command providing the definition of a VsCode Task
-	// +optional
-	VscodeTask *VscodeConfigurationCommand `json:"vscodeTask,omitempty"`
-
-	// Command providing the definition of a VsCode launch action
-	// +optional
-	VscodeLaunch *VscodeConfigurationCommand `json:"vscodeLaunch,omitempty"`
-
 	// Composite command that allows executing several sub-commands
 	// either sequentially or concurrently
 	// +optional
@@ -173,40 +163,6 @@ type CompositeCommand struct {
 	Parallel bool `json:"parallel,omitempty"`
 }
 
-// VscodeConfigurationCommandLocationType describes the type of
-// the location the configuration is fetched from.
-// Only one of the following component type may be specified.
-// +kubebuilder:validation:Enum=Uri;Inlined
-type VscodeConfigurationCommandLocationType string
-
-const (
-	UriVscodeConfigurationCommandLocationType     VscodeConfigurationCommandLocationType = "Uri"
-	InlinedVscodeConfigurationCommandLocationType VscodeConfigurationCommandLocationType = "Inlined"
-)
-
-// +union
-type VscodeConfigurationCommandLocation struct {
-	// Type of Vscode configuration command location
-	// +
-	// +unionDiscriminator
-	// +optional
-	LocationType VscodeConfigurationCommandLocationType `json:"locationType,omitempty"`
-
-	// Location as an absolute of relative URI
-	// the VsCode configuration will be fetched from
-	// +optional
-	Uri string `json:"uri,omitempty"`
-
-	// Inlined content of the VsCode configuration
-	// +optional
-	Inlined string `json:"inlined,omitempty"`
-}
-
-type VscodeConfigurationCommand struct {
-	BaseCommand                        `json:",inline"`
-	VscodeConfigurationCommandLocation `json:",inline"`
-}
-
 type CustomCommand struct {
 	LabeledCommand `json:",inline"`
 

diff --git a/pkg/apis/workspaces/v1alpha2/projects.go b/pkg/apis/workspaces/v1alpha2/projects.go
@@ -73,7 +73,7 @@ type ProjectSource struct {
 	// +optional
 	Git *GitProjectSource `json:"git,omitempty"`
 
-	// Project's GitHub source
+	// Project's GitHub source. Deprecated, use `Git` instead
 	// +optional
 	Github *GithubProjectSource `json:"github,omitempty"`
 

diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go