diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml index 74c58786d..af0ad82cf 100644 --- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml @@ -6957,8 +6957,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7003,35 +7001,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 @@ -7041,7 +7010,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -7077,8 +7045,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7118,35 +7084,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 @@ -7156,7 +7093,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -7195,8 +7131,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7257,36 +7191,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 @@ -7296,7 +7200,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -7325,8 +7228,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7382,36 +7283,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 @@ -7421,7 +7292,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 d86fa716a..14129f714 100644 --- a/crds/workspace.devfile.io_devworkspaces.yaml +++ b/crds/workspace.devfile.io_devworkspaces.yaml @@ -6962,8 +6962,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7008,35 +7006,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 @@ -7046,7 +7015,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -7082,8 +7050,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -7123,35 +7089,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 @@ -7161,7 +7098,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -7200,8 +7136,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7262,36 +7196,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 @@ -7301,7 +7205,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -7330,8 +7233,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7387,36 +7288,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 @@ -7426,7 +7297,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 a3b0a58eb..17dd8c069 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml @@ -6625,8 +6625,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6670,34 +6668,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 @@ -6707,7 +6677,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -6743,8 +6712,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6783,34 +6750,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 @@ -6820,7 +6759,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -6859,8 +6797,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -6917,33 +6853,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 @@ -6953,7 +6862,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -6981,8 +6889,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7035,33 +6941,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 @@ -7071,7 +6950,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 4ab323939..148b1d23d 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml @@ -6630,8 +6630,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6675,34 +6673,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 @@ -6712,7 +6682,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string sparseCheckoutDirs: @@ -6748,8 +6717,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip properties: @@ -6788,34 +6755,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 @@ -6825,7 +6764,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip type: string subDir: @@ -6864,8 +6802,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -6922,33 +6858,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 @@ -6958,7 +6867,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string @@ -6986,8 +6894,6 @@ spec: oneOf: - required: - git - - required: - - github - required: - zip - required: @@ -7040,33 +6946,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 @@ -7076,7 +6955,6 @@ spec: description: Type of project source enum: - Git - - Github - Zip - Custom type: string diff --git a/pkg/apis/workspaces/v1alpha1/conversion.go b/pkg/apis/workspaces/v1alpha1/conversion.go index 4be589bdf..f244d80a6 100644 --- a/pkg/apis/workspaces/v1alpha1/conversion.go +++ b/pkg/apis/workspaces/v1alpha1/conversion.go @@ -4,6 +4,12 @@ import ( "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" ) +const ( + // ConvertedFromAttribute marks a devfile element as being converted from a different underlying field. For example, + // since v1alpha2 does not support + ConvertedFromAttribute = "conversion.api.devfile.io/converted-from" +) + func convertDevWorkspaceTo_v1alpha2(src *DevWorkspace, dest *v1alpha2.DevWorkspace) error { dest.ObjectMeta = src.ObjectMeta dest.Status.DevWorkspaceId = src.Status.WorkspaceId diff --git a/pkg/apis/workspaces/v1alpha1/projects_conversion.go b/pkg/apis/workspaces/v1alpha1/projects_conversion.go index bec94dffd..44c2ffb50 100644 --- a/pkg/apis/workspaces/v1alpha1/projects_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/projects_conversion.go @@ -4,9 +4,25 @@ import ( "encoding/json" "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" + "github.com/devfile/api/v2/pkg/attributes" +) + +const ( + GitHubConversionFromAttributeValue = "GitHub" ) func convertProjectTo_v1alpha2(src *Project, dest *v1alpha2.Project) error { + // Convert Github type projects in v1alpha1 to Git-type projects in v1alpha2, since Github was dropped + if src.Github != nil { + src.Git = &GitProjectSource{ + GitLikeProjectSource: src.Github.GitLikeProjectSource, + } + if dest.Attributes == nil { + dest.Attributes = attributes.Attributes{} + } + dest.Attributes.PutString(ConvertedFromAttribute, GitHubConversionFromAttributeValue) + } + jsonProject, err := json.Marshal(src) if err != nil { return err @@ -15,18 +31,23 @@ func convertProjectTo_v1alpha2(src *Project, dest *v1alpha2.Project) error { if err != nil { return err } + var sparseCheckoutDir string 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 } if sparseCheckoutDir != "" { dest.SparseCheckoutDirs = []string{sparseCheckoutDir} } + + // Make sure we didn't modify underlying src struct + if src.Github != nil { + src.Git = nil + } + return nil } @@ -49,16 +70,37 @@ 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 } } + + // Check if a Git-type project was originally a Github-type project in v1alpha1 + if src.Git != nil && src.Attributes != nil { + convertedFrom := src.Attributes.GetString(ConvertedFromAttribute, nil) + if convertedFrom == GitHubConversionFromAttributeValue { + dest.Github = &GithubProjectSource{ + GitLikeProjectSource: dest.Git.GitLikeProjectSource, + } + dest.Git = nil + } + } + return nil } func convertStarterProjectTo_v1alpha2(src *StarterProject, dest *v1alpha2.StarterProject) error { + // Convert Github type projects in v1alpha1 to Git-type projects in v1alpha2, since Github was dropped + if src.Github != nil { + src.Git = &GitProjectSource{ + GitLikeProjectSource: src.Github.GitLikeProjectSource, + } + if dest.Attributes == nil { + dest.Attributes = attributes.Attributes{} + } + dest.Attributes.PutString(ConvertedFromAttribute, GitHubConversionFromAttributeValue) + } + jsonProject, err := json.Marshal(src) if err != nil { return err @@ -74,12 +116,15 @@ 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 } + // Make sure we didn't modify underlying src struct + if src.Github != nil { + src.Git = nil + } + return nil } @@ -97,12 +142,21 @@ 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 } } + // Check if a Git-type project was originally a Github-type project in v1alpha1 + if src.Git != nil && src.Attributes != nil { + convertedFrom := src.Attributes.GetString(ConvertedFromAttribute, nil) + if convertedFrom == GitHubConversionFromAttributeValue { + dest.Github = &GithubProjectSource{ + GitLikeProjectSource: dest.Git.GitLikeProjectSource, + } + dest.Git = nil + } + } + return nil } 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"` -} 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 9951ed400..64090ac94 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/pkg/validation/projects.go b/pkg/validation/projects.go index 0a2bfc2a5..3fea1b8ca 100644 --- a/pkg/validation/projects.go +++ b/pkg/validation/projects.go @@ -16,8 +16,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 } @@ -60,8 +58,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 } diff --git a/pkg/validation/projects_test.go b/pkg/validation/projects_test.go index fd2549b82..2e59737ca 100644 --- a/pkg/validation/projects_test.go +++ b/pkg/validation/projects_test.go @@ -1,9 +1,10 @@ package validation import ( - "github.com/devfile/api/v2/pkg/attributes" "testing" + "github.com/devfile/api/v2/pkg/attributes" + "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" "github.com/stretchr/testify/assert" ) @@ -23,20 +24,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, projectAttribute attributes.Attributes) v1alpha2.Project { return v1alpha2.Project{ Attributes: projectAttribute, @@ -52,20 +39,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" @@ -91,14 +64,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"}, attributes.Attributes{}), }, 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"}, attributes.Attributes{}), }, wantErr: &wrongCheckoutErr, }, @@ -117,8 +90,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{}, attributes.Attributes{}), + generateDummyGitStarterProject("project3", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}), }, wantErr: &atleastOneRemoteErr, }, @@ -162,13 +135,13 @@ func TestValidateProjects(t *testing.T) { name: "Valid Project", projects: []v1alpha2.Project{ generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}, attributes.Attributes{}), - generateDummyGithubProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}), + generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{"origin": "originremote"}, attributes.Attributes{}), }, }, { 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"}, attributes.Attributes{}), }, wantErr: &missingCheckOutFromRemoteErr, }, @@ -176,14 +149,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"}, attributes.Attributes{}), - generateDummyGithubProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}), + generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: ""}, map[string]string{"origin": "originremote", "test": "testremote"}, attributes.Attributes{}), }, 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"}, attributes.Attributes{}), generateDummyGitProject("project2", &v1alpha2.CheckoutFrom{Remote: "origin1"}, map[string]string{"origin2": "originremote2"}, attributes.Attributes{}), }, wantErr: &wrongCheckoutErr, @@ -198,7 +171,7 @@ func TestValidateProjects(t *testing.T) { name: "Invalid Project with empty remotes", projects: []v1alpha2.Project{ generateDummyGitProject("project1", &v1alpha2.CheckoutFrom{Remote: "origin"}, map[string]string{}, attributes.Attributes{}), - 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"}, attributes.Attributes{}), }, wantErr: &atleastOneRemoteErr, }, diff --git a/pkg/validation/variables/variables_project.go b/pkg/validation/variables/variables_project.go index 136e7ec1a..078a94d36 100644 --- a/pkg/validation/variables/variables_project.go +++ b/pkg/validation/variables/variables_project.go @@ -89,13 +89,8 @@ 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: - var gitProject *v1alpha2.GitLikeProjectSource - if projectSource.Git != nil { - gitProject = &projectSource.Git.GitLikeProjectSource - } else if projectSource.Github != nil { - gitProject = &projectSource.Github.GitLikeProjectSource - } + case projectSource.Git != nil: + gitProject := &projectSource.Git.GitLikeProjectSource if gitProject.CheckoutFrom != nil { // validate git checkout revision diff --git a/schemas/latest/dev-workspace-template-spec.json b/schemas/latest/dev-workspace-template-spec.json index 8dfe76292..52c0e1288 100644 --- a/schemas/latest/dev-workspace-template-spec.json +++ b/schemas/latest/dev-workspace-template-spec.json @@ -2543,11 +2543,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2593,35 +2588,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", @@ -2668,11 +2634,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2718,35 +2679,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", @@ -2800,11 +2732,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2876,38 +2803,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", @@ -2950,11 +2845,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3026,38 +2916,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 ba2ad9c5d..b926e9bc1 100644 --- a/schemas/latest/dev-workspace-template.json +++ b/schemas/latest/dev-workspace-template.json @@ -2708,11 +2708,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2758,35 +2753,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", @@ -2833,11 +2799,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2883,35 +2844,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", @@ -2965,11 +2897,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3041,38 +2968,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", @@ -3115,11 +3010,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3191,38 +3081,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 09b0cfe6c..c1d3c61a9 100644 --- a/schemas/latest/dev-workspace.json +++ b/schemas/latest/dev-workspace.json @@ -2721,11 +2721,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2771,35 +2766,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", @@ -2846,11 +2812,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2896,35 +2857,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", @@ -2978,11 +2910,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3054,38 +2981,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", @@ -3128,11 +3023,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3204,38 +3094,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 8ee947f86..30836dc1f 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", @@ -1428,11 +1394,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1478,35 +1439,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", @@ -1560,11 +1492,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1613,38 +1540,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", @@ -1692,11 +1587,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1745,38 +1635,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 51ae599a3..0f4309d51 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template-spec.json +++ b/schemas/latest/ide-targeted/dev-workspace-template-spec.json @@ -2821,11 +2821,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -2878,40 +2873,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", @@ -2964,11 +2925,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3021,40 +2977,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", @@ -3116,11 +3038,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3200,43 +3117,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", @@ -3284,11 +3164,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3368,43 +3243,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 8f2daf3b1..60f52a53d 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template.json +++ b/schemas/latest/ide-targeted/dev-workspace-template.json @@ -3019,11 +3019,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3076,40 +3071,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", @@ -3162,11 +3123,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3219,40 +3175,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", @@ -3314,11 +3236,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3398,43 +3315,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", @@ -3482,11 +3362,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3566,43 +3441,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 3b9da8435..182dad2df 100644 --- a/schemas/latest/ide-targeted/dev-workspace.json +++ b/schemas/latest/ide-targeted/dev-workspace.json @@ -3032,11 +3032,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3089,40 +3084,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", @@ -3175,11 +3136,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3232,40 +3188,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", @@ -3327,11 +3249,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3411,43 +3328,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", @@ -3495,11 +3375,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -3579,43 +3454,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 db0a3a660..853d53852 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", @@ -1588,11 +1549,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1645,40 +1601,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", @@ -1740,11 +1662,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1800,43 +1717,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", @@ -1890,11 +1770,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1950,43 +1825,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 a811dd80b..beaa78eee 100644 --- a/schemas/latest/ide-targeted/parent-overrides.json +++ b/schemas/latest/ide-targeted/parent-overrides.json @@ -1320,11 +1320,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1377,40 +1372,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", @@ -1458,11 +1419,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1515,40 +1471,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 2a3b8dfb1..16a036bb8 100644 --- a/schemas/latest/parent-overrides.json +++ b/schemas/latest/parent-overrides.json @@ -1185,11 +1185,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1235,35 +1230,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", @@ -1306,11 +1272,6 @@ "git" ] }, - { - "required": [ - "github" - ] - }, { "required": [ "zip" @@ -1356,35 +1317,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", diff --git a/test/v200/devfiles/parent/parentAll.yaml b/test/v200/devfiles/parent/parentAll.yaml index 7f0600684..3837bd01c 100644 --- a/test/v200/devfiles/parent/parentAll.yaml +++ b/test/v200/devfiles/parent/parentAll.yaml @@ -45,10 +45,6 @@ parent: git: remotes: origin: test-origin - - name: testProject2 - github: - remotes: - origin: test-origin - name: testProject3 zip: location: git-repo.zip @@ -57,10 +53,6 @@ parent: git: remotes: origin: test-origin - - name: testStarterProject2 - github: - remotes: - origin: test-origin - name: testStarterProject3 zip: location: git-repo.zip diff --git a/test/v200/devfiles/projects/projectsAll.yaml b/test/v200/devfiles/projects/projectsAll.yaml index e809e37e0..bae6a0b5b 100644 --- a/test/v200/devfiles/projects/projectsAll.yaml +++ b/test/v200/devfiles/projects/projectsAll.yaml @@ -6,14 +6,6 @@ origin: test-origin clonePath: /Users/test/projects sparseCheckoutDirs: [thisDir, thatDir] - - name: testproject2 - github: - checkoutFrom: - remote: test-branch - remotes: - origin: test-origin - clonePath: /Users/test/projects - sparseCheckoutDirs: [thisDir, thatDir] - name: testproject3 zip: location: git-repo.zip 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/projectsMinimum.yaml b/test/v200/devfiles/projects/projectsMinimum.yaml index 92a38238e..322b529cb 100644 --- a/test/v200/devfiles/projects/projectsMinimum.yaml +++ b/test/v200/devfiles/projects/projectsMinimum.yaml @@ -2,10 +2,6 @@ git: remotes: origin: test-origin - - name: testproject2 - github: - remotes: - origin: test-origin - name: testproject3 zip: location: git-repo.zip 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..d01b8023b 100644 --- a/test/v200/devfiles/starterProjects/starterProjectsAll.yaml +++ b/test/v200/devfiles/starterProjects/starterProjectsAll.yaml @@ -6,14 +6,6 @@ origin: test-origin description: Test starter project subDir: test-subdir - - name: starterproject2 - github: - checkoutFrom: - remote: test-branch - remotes: - origin: test-origin - description: Test starter project - subDir: test-subdir - name: starterproject3 zip: location: git-repo.zip 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..9302fbbbc 100644 --- a/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml +++ b/test/v200/devfiles/starterProjects/starterProjectsMinimum.yaml @@ -2,10 +2,6 @@ git: remotes: origin: test-origin - - name: starterproject12 - github: - remotes: - origin: test-origin - name: starterproject13 zip: location: git-repo.zip 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..558e4460b 100644 --- a/test/v200/json/project-parent-tests.json +++ b/test/v200/json/project-parent-tests.json @@ -24,24 +24,12 @@ "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", - "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"] }, - { - "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", @@ -49,10 +37,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/project-tests.json b/test/v200/json/project-tests.json index 6c3405b9a..e60946181 100644 --- a/test/v200/json/project-tests.json +++ b/test/v200/json/project-tests.json @@ -24,36 +24,18 @@ "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", - "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"] }, - { - "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..c41044a34 100644 --- a/test/v200/json/starterProject-parent-tests.json +++ b/test/v200/json/starterProject-parent-tests.json @@ -24,24 +24,12 @@ "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", - "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"] }, - { - "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..065431c36 100644 --- a/test/v200/json/starterProject-tests.json +++ b/test/v200/json/starterProject-tests.json @@ -24,36 +24,18 @@ "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", - "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"] }, - { - "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"] } ] }