Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

397 add annotation to imported elements #80

Merged
merged 8 commits into from
Apr 21, 2021
Merged

397 add annotation to imported elements #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0372db2
add source attribute function
yangcao77 Apr 13, 2021
c6a86be
Merge branch 'master' of github.com:devfile/library into 397-addAnnot…
yangcao77 Apr 13, 2021
a33f7e3
added functions for parentoverrides and pluginoverrides
yangcao77 Apr 14, 2021
34e258c
update unit tests
yangcao77 Apr 16, 2021
7e3eadc
add more unit tests
yangcao77 Apr 19, 2021
dbf9043
combine 3 addAttribute functions into one
yangcao77 Apr 20, 2021
86d3c1c
add unit test for AddSourceAttributesForOverrideAndMerge
yangcao77 Apr 20, 2021
e3d1c45
fix error check and function desc
yangcao77 Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions pkg/devfile/parser/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,25 +193,30 @@ func parseParentAndPlugin(d DevfileObj, resolveCtx *resolutionContextTree, tool
switch {
case parent.Uri != "":
parentDevfileObj, err = parseFromURI(parent.ImportReference, d.Ctx, resolveCtx, tool)
if err != nil {
return err
}
case parent.Id != "":
parentDevfileObj, err = parseFromRegistry(parent.ImportReference, resolveCtx, tool)
if err != nil {
return err
}
case parent.Kubernetes != nil:
parentDevfileObj, err = parseFromKubeCRD(parent.ImportReference, resolveCtx, tool)
if err != nil {
return err
}
default:
return fmt.Errorf("devfile parent does not define any resources")
}
if err != nil {
return err
}

parentWorkspaceContent := parentDevfileObj.Data.GetDevfileWorkspaceSpecContent()
// add attribute to parent elements
err = addSourceAttributesForOverrideAndMerge(parent.ImportReference, parentWorkspaceContent)
if err != nil {
return err
}
if !reflect.DeepEqual(parent.ParentOverrides, v1.ParentOverrides{}) {
// add attribute to parentOverrides elements
curNodeImportReference := resolveCtx.importReference
err = addSourceAttributesForOverrideAndMerge(curNodeImportReference, &parent.ParentOverrides)
if err != nil {
return err
}
flattenedParent, err = apiOverride.OverrideDevWorkspaceTemplateSpec(parentWorkspaceContent, parent.ParentOverrides)
if err != nil {
return err
Expand All @@ -236,22 +241,30 @@ func parseParentAndPlugin(d DevfileObj, resolveCtx *resolutionContextTree, tool
switch {
case plugin.Uri != "":
pluginDevfileObj, err = parseFromURI(plugin.ImportReference, d.Ctx, resolveCtx, tool)
if err != nil {
return err
}
case plugin.Id != "":
pluginDevfileObj, err = parseFromRegistry(plugin.ImportReference, resolveCtx, tool)
if err != nil {
return err
}
case plugin.Kubernetes != nil:
pluginDevfileObj, err = parseFromKubeCRD(plugin.ImportReference, resolveCtx, tool)
default:
return fmt.Errorf("plugin %s does not define any resources", component.Name)
}
if err != nil {
return err
}
pluginWorkspaceContent := pluginDevfileObj.Data.GetDevfileWorkspaceSpecContent()
// add attribute to plugin elements
err = addSourceAttributesForOverrideAndMerge(plugin.ImportReference, pluginWorkspaceContent)
if err != nil {
return err
}
flattenedPlugin := pluginWorkspaceContent
if !reflect.DeepEqual(plugin.PluginOverrides, v1.PluginOverrides{}) {
// add attribute to pluginOverrides elements
curNodeImportReference := resolveCtx.importReference
err = addSourceAttributesForOverrideAndMerge(curNodeImportReference, &plugin.PluginOverrides)
if err != nil {
return err
}
flattenedPlugin, err = apiOverride.OverrideDevWorkspaceTemplateSpec(pluginWorkspaceContent, plugin.PluginOverrides)
if err != nil {
return err
Expand Down
Loading