Go: Bump github.com/devfile/api/v2 from 2.2.1 to 2.2.2 (#7177)

Bumps [github.com/devfile/api/v2](https://github.com/devfile/api) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/devfile/api/releases)
- [Changelog](https://github.com/devfile/api/blob/main/RELEASE.md)
- [Commits](https://github.com/devfile/api/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: github.com/devfile/api/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot]
2024-01-15 11:00:45 +00:00
committed by GitHub
parent 69f581870f
commit 48867e6c48
9 changed files with 51 additions and 13 deletions

View File

@@ -79,6 +79,14 @@ type DevWorkspaceTemplateSpecContent struct {
// +devfile:toplevellist
StarterProjects []StarterProject `json:"starterProjects,omitempty" patchStrategy:"merge" patchMergeKey:"name"`
// Additional projects related to the main project in the devfile, contianing names and sources locations
// +optional
// +patchMergeKey=name
// +patchStrategy=merge
// +devfile:overrides:include:omitInPlugin=true,description=Overrides of dependentProjects encapsulated in a parent devfile.
// +devfile:toplevellist
DependentProjects []Project `json:"dependentProjects,omitempty" patchStrategy:"merge" patchMergeKey:"name"`
// Predefined, ready-to-use, devworkspace-related commands
// +optional
// +patchMergeKey=id

View File

@@ -18,5 +18,5 @@
// +k8s:deepcopy-gen=package,register
// +k8s:openapi-gen=true
// +groupName=workspace.devfile.io
// +devfile:jsonschema:version=2.2.1
// +devfile:jsonschema:version=2.2.2
package v1alpha2

View File

@@ -1818,6 +1818,13 @@ func (in *DevWorkspaceTemplateSpecContent) DeepCopyInto(out *DevWorkspaceTemplat
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.DependentProjects != nil {
in, out := &in.DependentProjects, &out.DependentProjects
*out = make([]Project, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.Commands != nil {
in, out := &in.Commands, &out.Commands
*out = make([]Command, len(*in))
@@ -3543,6 +3550,13 @@ func (in *ParentOverrides) DeepCopyInto(out *ParentOverrides) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.DependentProjects != nil {
in, out := &in.DependentProjects, &out.DependentProjects
*out = make([]ProjectParentOverride, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
if in.Commands != nil {
in, out := &in.Commands, &out.Commands
*out = make([]CommandParentOverride, len(*in))

View File

@@ -47,6 +47,14 @@ type ParentOverrides struct {
// +devfile:toplevellist
StarterProjects []StarterProjectParentOverride `json:"starterProjects,omitempty" patchStrategy:"merge" patchMergeKey:"name"`
// Overrides of dependentProjects encapsulated in a parent devfile.
// Overriding is done according to K8S strategic merge patch standard rules.
// +optional
// +patchMergeKey=name
// +patchStrategy=merge
// +devfile:toplevellist
DependentProjects []ProjectParentOverride `json:"dependentProjects,omitempty" patchStrategy:"merge" patchMergeKey:"name"`
// Overrides of commands encapsulated in a parent devfile or a plugin.
// Overriding is done according to K8S strategic merge patch standard rules.
// +optional

View File

@@ -2,19 +2,21 @@ package v1alpha2
func (container DevWorkspaceTemplateSpecContent) GetToplevelLists() TopLevelLists {
return TopLevelLists{
"Components": extractKeys(container.Components),
"Projects": extractKeys(container.Projects),
"StarterProjects": extractKeys(container.StarterProjects),
"Commands": extractKeys(container.Commands),
"Components": extractKeys(container.Components),
"Projects": extractKeys(container.Projects),
"StarterProjects": extractKeys(container.StarterProjects),
"DependentProjects": extractKeys(container.DependentProjects),
"Commands": extractKeys(container.Commands),
}
}
func (container ParentOverrides) GetToplevelLists() TopLevelLists {
return TopLevelLists{
"Components": extractKeys(container.Components),
"Projects": extractKeys(container.Projects),
"StarterProjects": extractKeys(container.StarterProjects),
"Commands": extractKeys(container.Commands),
"Components": extractKeys(container.Components),
"Projects": extractKeys(container.Projects),
"StarterProjects": extractKeys(container.StarterProjects),
"DependentProjects": extractKeys(container.DependentProjects),
"Commands": extractKeys(container.Commands),
}
}

View File

@@ -39,6 +39,9 @@ type VariableWarning struct {
// StarterProjects stores a map of starter project names to the invalid variable references
StarterProjects map[string][]string
// DependentProjects stores a map of dependent project names to invalid variable references
DependentProjects map[string][]string
}
// ValidateAndReplaceGlobalVariable validates the workspace template spec data for global variable references and replaces them with the variable value
@@ -58,6 +61,9 @@ func ValidateAndReplaceGlobalVariable(workspaceTemplateSpec *v1alpha2.DevWorkspa
// Validate the starter projects and replace for global variable
variableWarning.StarterProjects = ValidateAndReplaceForStarterProjects(workspaceTemplateSpec.Variables, workspaceTemplateSpec.StarterProjects)
// Validate the starter projects and replace for global variable
variableWarning.DependentProjects = ValidateAndReplaceForProjects(workspaceTemplateSpec.Variables, workspaceTemplateSpec.DependentProjects)
}
return variableWarning

2
vendor/modules.txt generated vendored
View File

@@ -167,7 +167,7 @@ github.com/devfile/alizer/pkg/apis/recognizer
github.com/devfile/alizer/pkg/schema
github.com/devfile/alizer/pkg/utils
github.com/devfile/alizer/pkg/utils/langfiles
# github.com/devfile/api/v2 v2.2.1
# github.com/devfile/api/v2 v2.2.2
## explicit; go 1.18
github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2
github.com/devfile/api/v2/pkg/attributes