From 538cfad73101a086854b4110c44edf1cf6bb056b Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Mon, 26 Apr 2021 11:36:43 -0400 Subject: [PATCH 1/6] Remove GitHub-type projects from v1alpha2 spec Signed-off-by: Angel Misevski --- pkg/apis/workspaces/v1alpha1/conversion_test.go | 10 +++------- pkg/apis/workspaces/v1alpha1/projects_conversion.go | 8 -------- pkg/apis/workspaces/v1alpha2/projects.go | 11 +---------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkg/apis/workspaces/v1alpha1/conversion_test.go b/pkg/apis/workspaces/v1alpha1/conversion_test.go index 6a1b4f0d3..d4e972b7f 100644 --- a/pkg/apis/workspaces/v1alpha1/conversion_test.go +++ b/pkg/apis/workspaces/v1alpha1/conversion_test.go @@ -148,25 +148,21 @@ var parentCommandFuzzFunc = func(command *Command, c fuzz.Continue) { var parentProjectFuzzFunc = func(project *Project, c fuzz.Continue) { // Custom projects are not supported in v1alpha2 parent project.Name = c.RandString() - switch c.Intn(3) { + switch c.Intn(2) { case 0: c.Fuzz(&project.Git) case 1: - c.Fuzz(&project.Github) - case 2: c.Fuzz(&project.Zip) } } var projectFuzzFunc = func(project *Project, c fuzz.Continue) { - switch c.Intn(4) { + switch c.Intn(3) { case 0: c.Fuzz(&project.Git) case 1: - c.Fuzz(&project.Github) - case 2: c.Fuzz(&project.Zip) - case 3: + case 2: c.Fuzz(&project.Custom) } } diff --git a/pkg/apis/workspaces/v1alpha1/projects_conversion.go b/pkg/apis/workspaces/v1alpha1/projects_conversion.go index bec94dffd..b3acbf6e4 100644 --- a/pkg/apis/workspaces/v1alpha1/projects_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/projects_conversion.go @@ -19,8 +19,6 @@ func convertProjectTo_v1alpha2(src *Project, dest *v1alpha2.Project) error { switch { case src.Git != nil: sparseCheckoutDir = src.Git.SparseCheckoutDir - case src.Github != nil: - sparseCheckoutDir = src.Github.SparseCheckoutDir case src.Zip != nil: sparseCheckoutDir = src.Zip.SparseCheckoutDir } @@ -49,8 +47,6 @@ func convertProjectFrom_v1alpha2(src *v1alpha2.Project, dest *Project) error { switch { case src.Git != nil: dest.Git.SparseCheckoutDir = sparseCheckoutDir - case src.Github != nil: - dest.Github.SparseCheckoutDir = sparseCheckoutDir case src.Zip != nil: dest.Zip.SparseCheckoutDir = sparseCheckoutDir } @@ -74,8 +70,6 @@ func convertStarterProjectTo_v1alpha2(src *StarterProject, dest *v1alpha2.Starte switch { case src.Git != nil: dest.SubDir = src.Git.SparseCheckoutDir - case src.Github != nil: - dest.SubDir = src.Github.SparseCheckoutDir case src.Zip != nil: dest.SubDir = src.Zip.SparseCheckoutDir } @@ -97,8 +91,6 @@ func convertStarterProjectFrom_v1alpha2(src *v1alpha2.StarterProject, dest *Star switch { case src.Git != nil: dest.Git.SparseCheckoutDir = src.SubDir - case src.Github != nil: - dest.Github.SparseCheckoutDir = src.SubDir case src.Zip != nil: dest.Zip.SparseCheckoutDir = src.SubDir } diff --git a/pkg/apis/workspaces/v1alpha2/projects.go b/pkg/apis/workspaces/v1alpha2/projects.go index b4a4e6934..1e500641c 100644 --- a/pkg/apis/workspaces/v1alpha2/projects.go +++ b/pkg/apis/workspaces/v1alpha2/projects.go @@ -51,12 +51,11 @@ type StarterProject struct { // Only one of the following project sources may be specified. // If none of the following policies is specified, the default one // is AllowConcurrent. -// +kubebuilder:validation:Enum=Git;Github;Zip;Custom +// +kubebuilder:validation:Enum=Git;Zip;Custom type ProjectSourceType string const ( GitProjectSourceType ProjectSourceType = "Git" - GitHubProjectSourceType ProjectSourceType = "Github" ZipProjectSourceType ProjectSourceType = "Zip" CustomProjectSourceType ProjectSourceType = "Custom" ) @@ -73,10 +72,6 @@ type ProjectSource struct { // +optional Git *GitProjectSource `json:"git,omitempty"` - // Project's GitHub source. Deprecated, use `Git` instead - // +optional - Github *GithubProjectSource `json:"github,omitempty"` - // Project's Zip source // +optional Zip *ZipProjectSource `json:"zip,omitempty"` @@ -129,7 +124,3 @@ type CheckoutFrom struct { type GitProjectSource struct { GitLikeProjectSource `json:",inline"` } - -type GithubProjectSource struct { - GitLikeProjectSource `json:",inline"` -} From 22b60db81e65585fb19f2f0ef33be4694d23a6e5 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Mon, 26 Apr 2021 11:38:45 -0400 Subject: [PATCH 2/6] Regenerate CRDs and schemas after removing GitHub-type projects Signed-off-by: Angel Misevski --- ...pace.devfile.io_devworkspaces.v1beta1.yaml | 130 -------------- crds/workspace.devfile.io_devworkspaces.yaml | 130 -------------- ...file.io_devworkspacetemplates.v1beta1.yaml | 122 ------------- ...pace.devfile.io_devworkspacetemplates.yaml | 122 ------------- .../v1alpha2/zz_generated.deepcopy.go | 42 ----- .../v1alpha2/zz_generated.parent_overrides.go | 10 +- .../zz_generated.union_definitions.go | 6 +- .../latest/dev-workspace-template-spec.json | 142 --------------- schemas/latest/dev-workspace-template.json | 142 --------------- schemas/latest/dev-workspace.json | 142 --------------- schemas/latest/devfile.json | 142 --------------- .../dev-workspace-template-spec.json | 162 ------------------ .../ide-targeted/dev-workspace-template.json | 162 ------------------ .../latest/ide-targeted/dev-workspace.json | 162 ------------------ schemas/latest/ide-targeted/devfile.json | 162 ------------------ .../latest/ide-targeted/parent-overrides.json | 78 --------- schemas/latest/parent-overrides.json | 68 -------- 17 files changed, 3 insertions(+), 1921 deletions(-) diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml index 5eafae52c..8f406d549 100644 --- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml @@ -6942,8 +6942,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6988,35 +6986,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use - `Git` instead - properties: - checkoutFrom: - description: Defines from what the project should - be checked out. Required if there are more than - one remote configured - properties: - remote: - description: The remote name should be used - as init. Required if there are more than one - remote configured - type: string - revision: - description: The revision to checkout from. - Should be branch name, tag or commit id. Default - branch is used if missing or specified revision - is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -7026,7 +6995,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -7057,8 +7025,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7098,35 +7064,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use - `Git` instead - properties: - checkoutFrom: - description: Defines from what the project should - be checked out. Required if there are more than - one remote configured - properties: - remote: - description: The remote name should be used - as init. Required if there are more than one - remote configured - type: string - revision: - description: The revision to checkout from. - Should be branch name, tag or commit id. Default - branch is used if missing or specified revision - is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -7136,7 +7073,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -7173,8 +7109,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7235,36 +7169,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7274,7 +7178,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -7303,8 +7206,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7360,36 +7261,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7399,7 +7270,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml index 439456298..3c42beb09 100644 --- a/crds/workspace.devfile.io_devworkspaces.yaml +++ b/crds/workspace.devfile.io_devworkspaces.yaml @@ -6947,8 +6947,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6993,35 +6991,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use - `Git` instead - properties: - checkoutFrom: - description: Defines from what the project should - be checked out. Required if there are more than - one remote configured - properties: - remote: - description: The remote name should be used - as init. Required if there are more than one - remote configured - type: string - revision: - description: The revision to checkout from. - Should be branch name, tag or commit id. Default - branch is used if missing or specified revision - is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -7031,7 +7000,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -7062,8 +7030,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7103,35 +7069,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use - `Git` instead - properties: - checkoutFrom: - description: Defines from what the project should - be checked out. Required if there are more than - one remote configured - properties: - remote: - description: The remote name should be used - as init. Required if there are more than one - remote configured - type: string - revision: - description: The revision to checkout from. - Should be branch name, tag or commit id. Default - branch is used if missing or specified revision - is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -7141,7 +7078,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -7178,8 +7114,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7240,36 +7174,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7279,7 +7183,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -7308,8 +7211,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7365,36 +7266,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7404,7 +7275,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml index fda3dc322..c60ab3a7d 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml @@ -6611,8 +6611,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6656,34 +6654,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -6693,7 +6663,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -6724,8 +6693,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6764,34 +6731,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -6801,7 +6740,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -6838,8 +6776,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -6896,33 +6832,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be checked - out. Required if there are more than one remote configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should be - branch name, tag or commit id. Default branch is used - if missing or specified revision is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -6932,7 +6841,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -6960,8 +6868,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7014,33 +6920,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be checked - out. Required if there are more than one remote configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should be - branch name, tag or commit id. Default branch is used - if missing or specified revision is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7050,7 +6929,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml index 1645b72cc..ace783dad 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml @@ -6616,8 +6616,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6661,34 +6659,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -6698,7 +6668,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -6729,8 +6698,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6769,34 +6736,6 @@ spec: configured type: object type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be - checked out. Required if there are more than one remote - configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should - be branch name, tag or commit id. Default branch - is used if missing or specified revision is not - found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured - type: object - type: object name: description: Project name maxLength: 63 @@ -6806,7 +6745,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -6843,8 +6781,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -6901,33 +6837,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be checked - out. Required if there are more than one remote configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should be - branch name, tag or commit id. Default branch is used - if missing or specified revision is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -6937,7 +6846,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -6965,8 +6873,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7019,33 +6925,6 @@ spec: required: - remotes type: object - github: - description: Project's GitHub source. Deprecated, use `Git` - instead - properties: - checkoutFrom: - description: Defines from what the project should be checked - out. Required if there are more than one remote configured - properties: - remote: - description: The remote name should be used as init. - Required if there are more than one remote configured - type: string - revision: - description: The revision to checkout from. Should be - branch name, tag or commit id. Default branch is used - if missing or specified revision is not found. - type: string - type: object - remotes: - additionalProperties: - type: string - description: The remotes map which should be initialized - in the git project. Must have at least one remote configured - type: object - required: - - remotes - type: object name: description: Project name maxLength: 63 @@ -7055,7 +6934,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go index 612e62bb3..30c38b403 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go @@ -1811,38 +1811,6 @@ func (in *GitProjectSourceParentOverride) DeepCopy() *GitProjectSourceParentOver return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GithubProjectSource) DeepCopyInto(out *GithubProjectSource) { - *out = *in - in.GitLikeProjectSource.DeepCopyInto(&out.GitLikeProjectSource) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GithubProjectSource. -func (in *GithubProjectSource) DeepCopy() *GithubProjectSource { - if in == nil { - return nil - } - out := new(GithubProjectSource) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *GithubProjectSourceParentOverride) DeepCopyInto(out *GithubProjectSourceParentOverride) { - *out = *in - in.GitLikeProjectSourceParentOverride.DeepCopyInto(&out.GitLikeProjectSourceParentOverride) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GithubProjectSourceParentOverride. -func (in *GithubProjectSourceParentOverride) DeepCopy() *GithubProjectSourceParentOverride { - if in == nil { - return nil - } - out := new(GithubProjectSourceParentOverride) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ImportReference) DeepCopyInto(out *ImportReference) { *out = *in @@ -2583,11 +2551,6 @@ func (in *ProjectSource) DeepCopyInto(out *ProjectSource) { *out = new(GitProjectSource) (*in).DeepCopyInto(*out) } - if in.Github != nil { - in, out := &in.Github, &out.Github - *out = new(GithubProjectSource) - (*in).DeepCopyInto(*out) - } if in.Zip != nil { in, out := &in.Zip, &out.Zip *out = new(ZipProjectSource) @@ -2618,11 +2581,6 @@ func (in *ProjectSourceParentOverride) DeepCopyInto(out *ProjectSourceParentOver *out = new(GitProjectSourceParentOverride) (*in).DeepCopyInto(*out) } - if in.Github != nil { - in, out := &in.Github, &out.Github - *out = new(GithubProjectSourceParentOverride) - (*in).DeepCopyInto(*out) - } if in.Zip != nil { in, out := &in.Zip, &out.Zip *out = new(ZipProjectSourceParentOverride) diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go index 7d19fe6a1..7fb0c8ab7 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go @@ -175,7 +175,7 @@ type ComponentUnionParentOverride struct { // +union type ProjectSourceParentOverride struct { - // +kubebuilder:validation:Enum=Git;Github;Zip + // +kubebuilder:validation:Enum=Git;Zip // Type of project source // + // +unionDiscriminator @@ -186,10 +186,6 @@ type ProjectSourceParentOverride struct { // +optional Git *GitProjectSourceParentOverride `json:"git,omitempty"` - // Project's GitHub source. Deprecated, use `Git` instead - // +optional - Github *GithubProjectSourceParentOverride `json:"github,omitempty"` - // Project's Zip source // +optional Zip *ZipProjectSourceParentOverride `json:"zip,omitempty"` @@ -271,10 +267,6 @@ type GitProjectSourceParentOverride struct { GitLikeProjectSourceParentOverride `json:",inline"` } -type GithubProjectSourceParentOverride struct { - GitLikeProjectSourceParentOverride `json:",inline"` -} - type ZipProjectSourceParentOverride struct { CommonProjectSourceParentOverride `json:",inline"` diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go index 4d28d9e26..50116cb1b 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go @@ -113,7 +113,6 @@ func (union *ProjectSource) Simplify() { // +k8s:deepcopy-gen=false type ProjectSourceVisitor struct { Git func(*GitProjectSource) error - Github func(*GithubProjectSource) error Zip func(*ZipProjectSource) error Custom func(*CustomProjectSource) error } @@ -159,9 +158,8 @@ func (union *ProjectSourceParentOverride) Simplify() { // +k8s:deepcopy-gen=false type ProjectSourceParentOverrideVisitor struct { - Git func(*GitProjectSourceParentOverride) error - Github func(*GithubProjectSourceParentOverride) error - Zip func(*ZipProjectSourceParentOverride) error + Git func(*GitProjectSourceParentOverride) error + Zip func(*ZipProjectSourceParentOverride) error } var commandUnionParentOverride reflect.Type = reflect.TypeOf(CommandUnionParentOverrideVisitor{}) diff --git a/schemas/latest/dev-workspace-template-spec.json b/schemas/latest/dev-workspace-template-spec.json index 43bf992cc..3e82add87 100644 --- a/schemas/latest/dev-workspace-template-spec.json +++ b/schemas/latest/dev-workspace-template-spec.json @@ -2541,11 +2541,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2591,35 +2586,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2665,11 +2631,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2715,35 +2676,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2797,11 +2729,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2873,38 +2800,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2947,11 +2842,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3023,38 +2913,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/dev-workspace-template.json b/schemas/latest/dev-workspace-template.json index 3366199a8..167b42c82 100644 --- a/schemas/latest/dev-workspace-template.json +++ b/schemas/latest/dev-workspace-template.json @@ -2706,11 +2706,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2756,35 +2751,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2830,11 +2796,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2880,35 +2841,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2962,11 +2894,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3038,38 +2965,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -3112,11 +3007,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3188,38 +3078,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/dev-workspace.json b/schemas/latest/dev-workspace.json index 10c00aff0..5409fe83e 100644 --- a/schemas/latest/dev-workspace.json +++ b/schemas/latest/dev-workspace.json @@ -2719,11 +2719,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2769,35 +2764,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2843,11 +2809,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2893,35 +2854,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -2975,11 +2907,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3051,38 +2978,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -3125,11 +3020,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3201,38 +3091,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/devfile.json b/schemas/latest/devfile.json index 7cb0eb71e..4a9b93614 100644 --- a/schemas/latest/devfile.json +++ b/schemas/latest/devfile.json @@ -1303,11 +1303,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1353,35 +1348,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -1427,11 +1393,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1477,35 +1438,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -1559,11 +1491,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1612,38 +1539,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -1691,11 +1586,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1744,38 +1634,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/ide-targeted/dev-workspace-template-spec.json b/schemas/latest/ide-targeted/dev-workspace-template-spec.json index 32e4561f4..a1878d00e 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template-spec.json +++ b/schemas/latest/ide-targeted/dev-workspace-template-spec.json @@ -2817,11 +2817,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2874,40 +2869,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -2958,11 +2919,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3015,40 +2971,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3110,11 +3032,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3194,43 +3111,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3278,11 +3158,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3362,43 +3237,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/ide-targeted/dev-workspace-template.json b/schemas/latest/ide-targeted/dev-workspace-template.json index 7c9f3be2d..204b9b38b 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template.json +++ b/schemas/latest/ide-targeted/dev-workspace-template.json @@ -3015,11 +3015,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3072,40 +3067,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3156,11 +3117,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3213,40 +3169,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3308,11 +3230,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3392,43 +3309,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3476,11 +3356,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3560,43 +3435,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/ide-targeted/dev-workspace.json b/schemas/latest/ide-targeted/dev-workspace.json index 91b552514..24072d30d 100644 --- a/schemas/latest/ide-targeted/dev-workspace.json +++ b/schemas/latest/ide-targeted/dev-workspace.json @@ -3028,11 +3028,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3085,40 +3080,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3169,11 +3130,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3226,40 +3182,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3321,11 +3243,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3405,43 +3322,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -3489,11 +3369,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3573,43 +3448,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/ide-targeted/devfile.json b/schemas/latest/ide-targeted/devfile.json index 04039a3cf..9a474e6ee 100644 --- a/schemas/latest/ide-targeted/devfile.json +++ b/schemas/latest/ide-targeted/devfile.json @@ -1445,11 +1445,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1502,40 +1497,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -1586,11 +1547,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1643,40 +1599,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -1738,11 +1660,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1798,43 +1715,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -1888,11 +1768,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1948,43 +1823,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "required": [ - "remotes" - ], - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/ide-targeted/parent-overrides.json b/schemas/latest/ide-targeted/parent-overrides.json index 0d9ab20d8..72402cea5 100644 --- a/schemas/latest/ide-targeted/parent-overrides.json +++ b/schemas/latest/ide-targeted/parent-overrides.json @@ -1318,11 +1318,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1375,40 +1370,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", @@ -1456,11 +1417,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1513,40 +1469,6 @@ "additionalProperties": false, "markdownDescription": "Project's Git source" }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string", - "markdownDescription": "The remote name should be used as init. Required if there are more than one remote configured" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string", - "markdownDescription": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found." - } - }, - "additionalProperties": false, - "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" - } - }, - "additionalProperties": false, - "markdownDescription": "Project's GitHub source. Deprecated, use `Git` instead" - }, "name": { "description": "Project name", "type": "string", diff --git a/schemas/latest/parent-overrides.json b/schemas/latest/parent-overrides.json index 45e078129..83c69a44c 100644 --- a/schemas/latest/parent-overrides.json +++ b/schemas/latest/parent-overrides.json @@ -1184,11 +1184,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1234,35 +1229,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", @@ -1305,11 +1271,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1355,35 +1316,6 @@ }, "additionalProperties": false }, - "github": { - "description": "Project's GitHub source. Deprecated, use `Git` instead", - "type": "object", - "properties": { - "checkoutFrom": { - "description": "Defines from what the project should be checked out. Required if there are more than one remote configured", - "type": "object", - "properties": { - "remote": { - "description": "The remote name should be used as init. Required if there are more than one remote configured", - "type": "string" - }, - "revision": { - "description": "The revision to checkout from. Should be branch name, tag or commit id. Default branch is used if missing or specified revision is not found.", - "type": "string" - } - }, - "additionalProperties": false - }, - "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - }, - "additionalProperties": false - }, "name": { "description": "Project name", "type": "string", From 74ae0129355734bfb6b10464d265bcee78dfb64a Mon Sep 17 00:00:00 2001 From: Stephanie Date: Tue, 27 Apr 2021 11:06:24 -0400 Subject: [PATCH 3/6] remove github support from project Signed-off-by: Stephanie --- pkg/apis/workspaces/v1alpha1/union_definitions.go | 1 - pkg/validation/projects.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/pkg/apis/workspaces/v1alpha1/union_definitions.go b/pkg/apis/workspaces/v1alpha1/union_definitions.go index d8647caf1..955a0bc3e 100644 --- a/pkg/apis/workspaces/v1alpha1/union_definitions.go +++ b/pkg/apis/workspaces/v1alpha1/union_definitions.go @@ -156,7 +156,6 @@ func (union *VscodeConfigurationCommandLocation) Simplify() { // +k8s:deepcopy-gen=false type ProjectSourceVisitor struct { Git func(*GitProjectSource) error - Github func(*GithubProjectSource) error Zip func(*ZipProjectSource) error Custom func(*CustomProjectSource) error } diff --git a/pkg/validation/projects.go b/pkg/validation/projects.go index ea4e8880d..3061e0ae2 100644 --- a/pkg/validation/projects.go +++ b/pkg/validation/projects.go @@ -15,8 +15,6 @@ func ValidateStarterProjects(starterProjects []v1alpha2.StarterProject) error { var gitSource v1alpha2.GitLikeProjectSource if starterProject.Git != nil { gitSource = starterProject.Git.GitLikeProjectSource - } else if starterProject.Github != nil { - gitSource = starterProject.Github.GitLikeProjectSource } else { continue } @@ -53,8 +51,6 @@ func ValidateProjects(projects []v1alpha2.Project) error { var gitSource v1alpha2.GitLikeProjectSource if project.Git != nil { gitSource = project.Git.GitLikeProjectSource - } else if project.Github != nil { - gitSource = project.Github.GitLikeProjectSource } else { continue } From 4be5a93a8579b7332ddc1da73f9a99147a5887e8 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Tue, 27 Apr 2021 11:45:47 -0400 Subject: [PATCH 4/6] remove tests to project/startproject .Github Signed-off-by: Stephanie --- pkg/validation/projects_test.go | 46 ++++--------------- pkg/validation/variables/variables_project.go | 5 +- test/v200/devfiles/projects/projectsAll.yaml | 2 +- .../projects/projectsGitAndGithub.yaml | 7 --- .../projects/projectsGithubAndZip.yaml | 6 --- .../projects/projectsGithubNoRemotes.yaml | 6 --- ...thubOrZip.yaml => projectsNoGitOrZip.yaml} | 0 .../starterProjects/starterProjectsAll.yaml | 2 +- .../starterProjectsGitAndGithub.yaml | 7 --- .../starterProjectsGithubAndZip.yaml | 6 --- .../starterProjectsGithubNoRemotes.yaml | 6 --- .../starterProjectsMinimum.yaml | 2 +- ...ip.yaml => starterProjectsNoGitOrZip.yaml} | 0 test/v200/json/project-parent-tests.json | 18 ++------ test/v200/json/project-tests.json | 22 +-------- .../json/starterProject-parent-tests.json | 16 +------ test/v200/json/starterProject-tests.json | 22 +-------- 17 files changed, 22 insertions(+), 151 deletions(-) delete mode 100644 test/v200/devfiles/projects/projectsGitAndGithub.yaml delete mode 100644 test/v200/devfiles/projects/projectsGithubAndZip.yaml delete mode 100644 test/v200/devfiles/projects/projectsGithubNoRemotes.yaml rename test/v200/devfiles/projects/{projectsNoGitGithubOrZip.yaml => projectsNoGitOrZip.yaml} (100%) delete mode 100644 test/v200/devfiles/starterProjects/starterProjectsGitAndGithub.yaml delete mode 100644 test/v200/devfiles/starterProjects/starterProjectsGithubAndZip.yaml delete mode 100644 test/v200/devfiles/starterProjects/starterProjectsGithubNoRemotes.yaml rename test/v200/devfiles/starterProjects/{starterProjectsNoGitGithubOrZip.yaml => starterProjectsNoGitOrZip.yaml} (100%) diff --git a/pkg/validation/projects_test.go b/pkg/validation/projects_test.go index c32853e71..d8f6b40dd 100644 --- a/pkg/validation/projects_test.go +++ b/pkg/validation/projects_test.go @@ -21,20 +21,6 @@ func generateDummyGitStarterProject(name string, checkoutRemote *v1alpha2.Checko } } -func generateDummyGithubStarterProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string) v1alpha2.StarterProject { - return v1alpha2.StarterProject{ - Name: name, - ProjectSource: v1alpha2.ProjectSource{ - Github: &v1alpha2.GithubProjectSource{ - GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ - Remotes: remotes, - CheckoutFrom: checkoutRemote, - }, - }, - }, - } -} - func generateDummyGitProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string) v1alpha2.Project { return v1alpha2.Project{ Name: name, @@ -49,20 +35,6 @@ func generateDummyGitProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, } } -func generateDummyGithubProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, remotes map[string]string) v1alpha2.Project { - return v1alpha2.Project{ - Name: name, - ProjectSource: v1alpha2.ProjectSource{ - Github: &v1alpha2.GithubProjectSource{ - GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ - Remotes: remotes, - CheckoutFrom: checkoutRemote, - }, - }, - }, - } -} - func TestValidateStarterProjects(t *testing.T) { oneRemoteErr := "starterProject .* should have one remote only" @@ -84,14 +56,14 @@ func TestValidateStarterProjects(t *testing.T) { { name: "Invalid Starter Project", starterProjects: []v1alpha2.StarterProject{ - generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}), }, wantErr: &oneRemoteErr, }, { name: "Invalid Starter Project with wrong checkout", starterProjects: []v1alpha2.StarterProject{ - generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"test": "testremote"}), + generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"test": "testremote"}), }, wantErr: &wrongCheckoutErr, }, @@ -110,8 +82,8 @@ func TestValidateStarterProjects(t *testing.T) { { name: "Invalid Starter Project with empty remotes", starterProjects: []v1alpha2.StarterProject{ - generateDummyGithubStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}), - generateDummyGithubStarterProject("project3", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitStarterProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}), + generateDummyGitStarterProject("project3", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}), }, wantErr: &atleastOneRemoteErr, }, @@ -144,13 +116,13 @@ func TestValidateProjects(t *testing.T) { name: "Valid Project", projects: []v1alpha2.Project{ generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}), - generateDummyGithubProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}), + generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}), }, }, { name: "Invalid Project with multiple remotes but no checkoutfrom", projects: []v1alpha2.Project{ - generateDummyGithubProject("project2", nil, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitProject("project2", nil, map[string]string{"origin": "originremote", "test": "testremote"}), }, wantErr: &missingCheckOutFromRemoteErr, }, @@ -158,14 +130,14 @@ func TestValidateProjects(t *testing.T) { name: "Invalid Project with multiple remote and empty checkout remote", projects: []v1alpha2.Project{ generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}), - generateDummyGithubProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}), }, wantErr: &missingCheckOutFromRemoteErr, }, { name: "Invalid Project with wrong checkout", projects: []v1alpha2.Project{ - generateDummyGithubProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin": "originremote", "test": "testremote"}), generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin2": "originremote2"}), }, wantErr: &wrongCheckoutErr, @@ -180,7 +152,7 @@ func TestValidateProjects(t *testing.T) { name: "Invalid Project with empty remotes", projects: []v1alpha2.Project{ generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}), - generateDummyGithubProject("project2", &v1alpha2.CheckoutFrom{Remote: "origins"}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origins"}, map[string]string{"origin": "originremote", "test": "testremote"}), }, wantErr: &atleastOneRemoteErr, }, diff --git a/pkg/validation/variables/variables_project.go b/pkg/validation/variables/variables_project.go index 136e7ec1a..418a54c72 100644 --- a/pkg/validation/variables/variables_project.go +++ b/pkg/validation/variables/variables_project.go @@ -89,14 +89,11 @@ func validateandReplaceForProjectSource(variables map[string]string, projectSour if projectSource.Zip.Location, err = validateAndReplaceDataWithVariable(projectSource.Zip.Location, variables); err != nil { checkForInvalidError(invalidKeys, err) } - case projectSource.Git != nil || projectSource.Github != nil: + case projectSource.Git != nil: var gitProject *v1alpha2.GitLikeProjectSource if projectSource.Git != nil { gitProject = &projectSource.Git.GitLikeProjectSource - } else if projectSource.Github != nil { - gitProject = &projectSource.Github.GitLikeProjectSource } - if gitProject.CheckoutFrom != nil { // validate git checkout revision if gitProject.CheckoutFrom.Revision, err = validateAndReplaceDataWithVariable(gitProject.CheckoutFrom.Revision, variables); err != nil { diff --git a/test/v200/devfiles/projects/projectsAll.yaml b/test/v200/devfiles/projects/projectsAll.yaml index e809e37e0..7de381d33 100644 --- a/test/v200/devfiles/projects/projectsAll.yaml +++ b/test/v200/devfiles/projects/projectsAll.yaml @@ -7,7 +7,7 @@ clonePath: /Users/test/projects sparseCheckoutDirs: [thisDir, thatDir] - name: testproject2 - github: + git: checkoutFrom: remote: test-branch remotes: diff --git a/test/v200/devfiles/projects/projectsGitAndGithub.yaml b/test/v200/devfiles/projects/projectsGitAndGithub.yaml deleted file mode 100644 index 473074991..000000000 --- a/test/v200/devfiles/projects/projectsGitAndGithub.yaml +++ /dev/null @@ -1,7 +0,0 @@ - - name: testproject1 - git: - remotes: - origin: test-origin - github: - remotes: - origin: test-origin diff --git a/test/v200/devfiles/projects/projectsGithubAndZip.yaml b/test/v200/devfiles/projects/projectsGithubAndZip.yaml deleted file mode 100644 index bda7c4c4a..000000000 --- a/test/v200/devfiles/projects/projectsGithubAndZip.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - name: testproject1 - github: - remotes: - origin: test-origin - zip: - location: git-repo.zip diff --git a/test/v200/devfiles/projects/projectsGithubNoRemotes.yaml b/test/v200/devfiles/projects/projectsGithubNoRemotes.yaml deleted file mode 100644 index 0d9146749..000000000 --- a/test/v200/devfiles/projects/projectsGithubNoRemotes.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - name: testproject2 - github: - checkoutFrom: - remote: test-branch - clonePath: /Users/test/projects - sparseCheckoutDirs: [thisDir, thatDir] diff --git a/test/v200/devfiles/projects/projectsNoGitGithubOrZip.yaml b/test/v200/devfiles/projects/projectsNoGitOrZip.yaml similarity index 100% rename from test/v200/devfiles/projects/projectsNoGitGithubOrZip.yaml rename to test/v200/devfiles/projects/projectsNoGitOrZip.yaml diff --git a/test/v200/devfiles/starterProjects/starterProjectsAll.yaml b/test/v200/devfiles/starterProjects/starterProjectsAll.yaml index 92d938661..d676b0bef 100644 --- a/test/v200/devfiles/starterProjects/starterProjectsAll.yaml +++ b/test/v200/devfiles/starterProjects/starterProjectsAll.yaml @@ -7,7 +7,7 @@ description: Test starter project subDir: test-subdir - name: starterproject2 - github: + git: checkoutFrom: remote: test-branch remotes: diff --git a/test/v200/devfiles/starterProjects/starterProjectsGitAndGithub.yaml b/test/v200/devfiles/starterProjects/starterProjectsGitAndGithub.yaml deleted file mode 100644 index 777a730e1..000000000 --- a/test/v200/devfiles/starterProjects/starterProjectsGitAndGithub.yaml +++ /dev/null @@ -1,7 +0,0 @@ - - name: starterproject11 - git: - remotes: - origin: test-origin - github: - remotes: - origin: test-origin diff --git a/test/v200/devfiles/starterProjects/starterProjectsGithubAndZip.yaml b/test/v200/devfiles/starterProjects/starterProjectsGithubAndZip.yaml deleted file mode 100644 index 19523dab2..000000000 --- a/test/v200/devfiles/starterProjects/starterProjectsGithubAndZip.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - name: starterproject11 - github: - remotes: - origin: test-origin - zip: - location: git-repo.zip diff --git a/test/v200/devfiles/starterProjects/starterProjectsGithubNoRemotes.yaml b/test/v200/devfiles/starterProjects/starterProjectsGithubNoRemotes.yaml deleted file mode 100644 index 156afc43d..000000000 --- a/test/v200/devfiles/starterProjects/starterProjectsGithubNoRemotes.yaml +++ /dev/null @@ -1,6 +0,0 @@ - - name: starterproject12 - github: - checkoutFrom: - remote: test-branch - description: Test starter project - subDir: test-subdir diff --git a/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml b/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml index 5e0218885..2d69e1b37 100644 --- a/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml +++ b/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml @@ -3,7 +3,7 @@ remotes: origin: test-origin - name: starterproject12 - github: + git: remotes: origin: test-origin - name: starterproject13 diff --git a/test/v200/devfiles/starterProjects/starterProjectsNoGitGithubOrZip.yaml b/test/v200/devfiles/starterProjects/starterProjectsNoGitOrZip.yaml similarity index 100% rename from test/v200/devfiles/starterProjects/starterProjectsNoGitGithubOrZip.yaml rename to test/v200/devfiles/starterProjects/starterProjectsNoGitOrZip.yaml diff --git a/test/v200/json/project-parent-tests.json b/test/v200/json/project-parent-tests.json index e347a3372..886f4b8e2 100644 --- a/test/v200/json/project-parent-tests.json +++ b/test/v200/json/project-parent-tests.json @@ -23,12 +23,6 @@ "ExpectOutcome" : "does not match pattern", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsMixedCaseName.yaml"] - }, - { - "FileName" : "projectsGitAndGithub.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsGitAndGithub.yaml"] }, { "FileName" : "projectsGitAndZip.yaml", @@ -36,23 +30,17 @@ "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsGitAndZip.yaml"] }, - { - "FileName" : "projectsGithubAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 1 and 2", - "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsGithubAndZip.yaml"] - }, { "FileName" : "projectsZipNoLocation.yaml", "ExpectOutcome" : "expected object, but got null", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsZipNoLocation.yaml"] }, - { - "FileName" : "projectsNoGitGithubOrZip.yaml", + { + "FileName" : "projectsNoGitOrZip.yaml", "ExpectOutcome" : "oneOf failed", "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsNoGitGithubOrZip.yaml"] + "devfiles/projects/projectsNoGitOrZip.yaml"] } ] } diff --git a/test/v200/json/project-tests.json b/test/v200/json/project-tests.json index 6c3405b9a..9656fafc5 100644 --- a/test/v200/json/project-tests.json +++ b/test/v200/json/project-tests.json @@ -23,12 +23,6 @@ "ExpectOutcome" : "does not match pattern", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsMixedCaseName.yaml"] - }, - { - "FileName" : "projectsGitAndGithub.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsGitAndGithub.yaml"] }, { "FileName" : "projectsGitAndZip.yaml", @@ -36,24 +30,12 @@ "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsGitAndZip.yaml"] }, - { - "FileName" : "projectsGithubAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 1 and 2", - "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsGithubAndZip.yaml"] - }, { "FileName" : "projectsGitNoRemotes.yaml", "ExpectOutcome" : "missing properties: \"remotes\"", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsGitNoRemotes.yaml"] }, - { - "FileName" : "projectsGithubNoRemotes.yaml", - "ExpectOutcome" : "missing properties: \"remotes\"", - "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsGithubNoRemotes.yaml"] - }, { "FileName" : "projectsZipNoLocation.yaml", "ExpectOutcome" : "expected object, but got null", @@ -61,10 +43,10 @@ "devfiles/projects/projectsZipNoLocation.yaml"] }, { - "FileName" : "projectsNoGitGithubOrZip.yaml", + "FileName" : "projectsNoGitOrZip.yaml", "ExpectOutcome" : "oneOf failed", "Files": ["devfiles/projects/projectsStart.yaml", - "devfiles/projects/projectsNoGitGithubOrZip.yaml"] + "devfiles/projects/projectsNoGitOrZip.yaml"] } ] } diff --git a/test/v200/json/starterProject-parent-tests.json b/test/v200/json/starterProject-parent-tests.json index 5d101d6c1..f449f7955 100644 --- a/test/v200/json/starterProject-parent-tests.json +++ b/test/v200/json/starterProject-parent-tests.json @@ -23,12 +23,6 @@ "ExpectOutcome" : "does not match pattern", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsMixedCaseName.yaml"] - }, - { - "FileName" : "starterProjectsGitAndGithub.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsGitAndGithub.yaml"] }, { "FileName" : "starterProjectsGitAndZip.yaml", @@ -36,12 +30,6 @@ "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsGitAndZip.yaml"] }, - { - "FileName" : "starterProjectsGithubAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 1 and 2", - "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsGithubAndZip.yaml"] - }, { "FileName" : "starterProjectsZipNoLocation.yaml", "ExpectOutcome" : "expected object, but got null", @@ -49,10 +37,10 @@ "devfiles/starterProjects/starterProjectsZipNoLocation.yaml"] }, { - "FileName" : "starterProjectsNoGitGithubOrZip.yaml", + "FileName" : "starterProjectsNoGitOrZip.yaml", "ExpectOutcome" : "oneOf failed", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsNoGitGithubOrZip.yaml"] + "devfiles/starterProjects/starterProjectsNoGitOrZip.yaml"] } ] } diff --git a/test/v200/json/starterProject-tests.json b/test/v200/json/starterProject-tests.json index 8cc6249f2..c21afea06 100644 --- a/test/v200/json/starterProject-tests.json +++ b/test/v200/json/starterProject-tests.json @@ -23,12 +23,6 @@ "ExpectOutcome" : "does not match pattern", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsMixedCaseName.yaml"] - }, - { - "FileName" : "starterProjectsGitAndGithub.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 1", - "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsGitAndGithub.yaml"] }, { "FileName" : "starterProjectsGitAndZip.yaml", @@ -36,24 +30,12 @@ "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsGitAndZip.yaml"] }, - { - "FileName" : "starterProjectsGithubAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 1 and 2", - "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsGithubAndZip.yaml"] - }, { "FileName" : "starterProjectsGitNoRemotes.yaml", "ExpectOutcome" : "missing properties: \"remotes\"", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsGitNoRemotes.yaml"] }, - { - "FileName" : "starterProjectsGithubNoRemotes.yaml", - "ExpectOutcome" : "missing properties: \"remotes\"", - "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsGithubNoRemotes.yaml"] - }, { "FileName" : "starterProjectsZipNoLocation.yaml", "ExpectOutcome" : "expected object, but got null", @@ -61,10 +43,10 @@ "devfiles/starterProjects/starterProjectsZipNoLocation.yaml"] }, { - "FileName" : "starterProjectsNoGitGithubOrZip.yaml", + "FileName" : "starterProjectsNoGitOrZip.yaml", "ExpectOutcome" : "oneOf failed", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", - "devfiles/starterProjects/starterProjectsNoGitGithubOrZip.yaml"] + "devfiles/starterProjects/starterProjectsNoGitOrZip.yaml"] } ] } From dab2efcce25cd5c520603350f0ac56239b881974 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Tue, 27 Apr 2021 13:39:46 -0400 Subject: [PATCH 5/6] edit test files Signed-off-by: Stephanie --- test/v200/devfiles/projects/projectsMinimum.yaml | 4 ---- .../v200/devfiles/starterProjects/starterProjectsMinimum.yaml | 4 ---- test/v200/json/project-parent-tests.json | 2 +- test/v200/json/project-tests.json | 2 +- test/v200/json/starterProject-parent-tests.json | 2 +- test/v200/json/starterProject-tests.json | 2 +- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/test/v200/devfiles/projects/projectsMinimum.yaml b/test/v200/devfiles/projects/projectsMinimum.yaml index 92a38238e..089b4da24 100644 --- a/test/v200/devfiles/projects/projectsMinimum.yaml +++ b/test/v200/devfiles/projects/projectsMinimum.yaml @@ -3,9 +3,5 @@ remotes: origin: test-origin - name: testproject2 - github: - remotes: - origin: test-origin - - name: testproject3 zip: location: git-repo.zip diff --git a/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml b/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml index 2d69e1b37..193bd0704 100644 --- a/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml +++ b/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml @@ -3,9 +3,5 @@ remotes: origin: test-origin - name: starterproject12 - git: - remotes: - origin: test-origin - - name: starterproject13 zip: location: git-repo.zip diff --git a/test/v200/json/project-parent-tests.json b/test/v200/json/project-parent-tests.json index 886f4b8e2..99d0ea8fe 100644 --- a/test/v200/json/project-parent-tests.json +++ b/test/v200/json/project-parent-tests.json @@ -26,7 +26,7 @@ }, { "FileName" : "projectsGitAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 2", + "ExpectOutcome" : "valid against schemas at indexes 0 and 1", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsGitAndZip.yaml"] }, diff --git a/test/v200/json/project-tests.json b/test/v200/json/project-tests.json index 9656fafc5..0fbc90b3f 100644 --- a/test/v200/json/project-tests.json +++ b/test/v200/json/project-tests.json @@ -26,7 +26,7 @@ }, { "FileName" : "projectsGitAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 2", + "ExpectOutcome" : "valid against schemas at indexes 0 and 1", "Files": ["devfiles/projects/projectsStart.yaml", "devfiles/projects/projectsGitAndZip.yaml"] }, diff --git a/test/v200/json/starterProject-parent-tests.json b/test/v200/json/starterProject-parent-tests.json index f449f7955..ed26d3051 100644 --- a/test/v200/json/starterProject-parent-tests.json +++ b/test/v200/json/starterProject-parent-tests.json @@ -26,7 +26,7 @@ }, { "FileName" : "starterProjectsGitAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 2", + "ExpectOutcome" : "valid against schemas at indexes 0 and 1", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsGitAndZip.yaml"] }, diff --git a/test/v200/json/starterProject-tests.json b/test/v200/json/starterProject-tests.json index c21afea06..53ced9a5e 100644 --- a/test/v200/json/starterProject-tests.json +++ b/test/v200/json/starterProject-tests.json @@ -26,7 +26,7 @@ }, { "FileName" : "starterProjectsGitAndZip.yaml", - "ExpectOutcome" : "valid against schemas at indexes 0 and 2", + "ExpectOutcome" : "valid against schemas at indexes 0 and 1", "Files": ["devfiles/starterProjects/starterProjectsStart.yaml", "devfiles/starterProjects/starterProjectsGitAndZip.yaml"] }, From 6056b35c2c6812cc7a2256bb7f41715da2b24411 Mon Sep 17 00:00:00 2001 From: Stephanie Date: Tue, 27 Apr 2021 14:10:57 -0400 Subject: [PATCH 6/6] fix modification on v1 Signed-off-by: Stephanie --- pkg/apis/workspaces/v1alpha1/union_definitions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/apis/workspaces/v1alpha1/union_definitions.go b/pkg/apis/workspaces/v1alpha1/union_definitions.go index 955a0bc3e..d8647caf1 100644 --- a/pkg/apis/workspaces/v1alpha1/union_definitions.go +++ b/pkg/apis/workspaces/v1alpha1/union_definitions.go @@ -156,6 +156,7 @@ func (union *VscodeConfigurationCommandLocation) Simplify() { // +k8s:deepcopy-gen=false type ProjectSourceVisitor struct { Git func(*GitProjectSource) error + Github func(*GithubProjectSource) error Zip func(*ZipProjectSource) error Custom func(*CustomProjectSource) error }