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

Remove the error wrapping for reading K8s/OpenShift YAMLs #164

Merged
merged 1 commit into from
Feb 16, 2023
Merged

Remove the error wrapping for reading K8s/OpenShift YAMLs #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions pkg/devfile/parser/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func ParseDevfile(args ParserArgs) (d DevfileObj, err error) {
d.Ctx.SetConvertUriToInlined(true)
err = parseKubeResourceFromURI(d)
if err != nil {
return d, errors.Wrapf(err, "failed to parse kubernetes/openshift component from uri to inlined")
return d, err
}
}

Expand Down Expand Up @@ -608,7 +608,7 @@ func convertDevWorskapceTemplateToDevObj(dwTemplate v1.DevWorkspaceTemplate) (d

}

//setDefaults sets the default values for nil boolean properties after the merging of devWorkspaceTemplateSpec is complete
// setDefaults sets the default values for nil boolean properties after the merging of devWorkspaceTemplateSpec is complete
func setDefaults(d DevfileObj) (err error) {

var devfileVersion string
Expand Down Expand Up @@ -709,21 +709,21 @@ func setDefaults(d DevfileObj) (err error) {
return nil
}

///setIsDefault sets the default value of CommandGroup.IsDefault if nil
// setIsDefault sets the default value of CommandGroup.IsDefault if nil
func setIsDefault(cmdGroup *v1.CommandGroup) {
val := cmdGroup.GetIsDefault()
cmdGroup.IsDefault = &val
}

//setEndpoints sets the default value of Endpoint.Secure if nil
// setEndpoints sets the default value of Endpoint.Secure if nil
func setEndpoints(endpoints []v1.Endpoint) {
for i := range endpoints {
val := endpoints[i].GetSecure()
endpoints[i].Secure = &val
}
}

//parseKubeResourceFromURI iterate through all kubernetes & openshift components, and parse from uri and update the content to inlined field in devfileObj
// parseKubeResourceFromURI iterate through all kubernetes & openshift components, and parse from uri and update the content to inlined field in devfileObj
func parseKubeResourceFromURI(devObj DevfileObj) error {
getKubeCompOptions := common.DevfileOptions{
ComponentOptions: common.ComponentOptions{
Expand All @@ -748,7 +748,7 @@ func parseKubeResourceFromURI(devObj DevfileObj) error {
/* #nosec G601 -- not an issue, kubeComp is de-referenced in sequence*/
err := convertK8sLikeCompUriToInlined(&kubeComp, devObj.Ctx)
if err != nil {
return errors.Wrapf(err, "failed to convert Kubernetes Uri to inlined for component '%s'", kubeComp.Name)
return errors.Wrapf(err, "failed to convert kubernetes uri to inlined for component '%s'", kubeComp.Name)
}
err = devObj.Data.UpdateComponent(kubeComp)
if err != nil {
Expand All @@ -761,7 +761,7 @@ func parseKubeResourceFromURI(devObj DevfileObj) error {
/* #nosec G601 -- not an issue, openshiftComp is de-referenced in sequence*/
err := convertK8sLikeCompUriToInlined(&openshiftComp, devObj.Ctx)
if err != nil {
return errors.Wrapf(err, "failed to convert Openshift Uri to inlined for component '%s'", openshiftComp.Name)
return errors.Wrapf(err, "failed to convert openshift uri to inlined for component '%s'", openshiftComp.Name)
}
err = devObj.Data.UpdateComponent(openshiftComp)
if err != nil {
Expand All @@ -772,7 +772,7 @@ func parseKubeResourceFromURI(devObj DevfileObj) error {
return nil
}

//convertK8sLikeCompUriToInlined read in kubernetes resources definition from uri and converts to kubernetest inlined field
// convertK8sLikeCompUriToInlined read in kubernetes resources definition from uri and converts to kubernetest inlined field
func convertK8sLikeCompUriToInlined(component *v1.Component, d devfileCtx.DevfileCtx) error {
var uri string
if component.Kubernetes != nil {
Expand All @@ -799,7 +799,7 @@ func convertK8sLikeCompUriToInlined(component *v1.Component, d devfileCtx.Devfil
return nil
}

//getKubernetesDefinitionFromUri read in kubernetes resources definition from uri and returns the raw content
// getKubernetesDefinitionFromUri read in kubernetes resources definition from uri and returns the raw content
func getKubernetesDefinitionFromUri(uri string, d devfileCtx.DevfileCtx) ([]byte, error) {
// validate URI
err := validation.ValidateURI(uri)
Expand Down Expand Up @@ -834,7 +834,7 @@ func getKubernetesDefinitionFromUri(uri string, d devfileCtx.DevfileCtx) ([]byte
params := util.HTTPRequestParams{URL: newUri}
data, err = util.DownloadInMemory(params)
if err != nil {
return nil, errors.Wrapf(err, "error getting kubernetes resources definition info from url '%s'", newUri)
return nil, errors.Wrapf(err, "error getting kubernetes resources definition information")
}
}
return data, nil
Expand Down