Merge pull request #1268 from aFlyBird0/fix-options-nil-pointer

daniel-hutao · web-flow · commit 520d7e8f8d15 · 2022-11-29T21:55:46.000+08:00
fix: options nil pointer error
diff --git a/internal/pkg/configmanager/pipelinetemplate.go b/internal/pkg/configmanager/pipelinetemplate.go
@@ -30,6 +30,9 @@ func (p *pipelineRaw) getPipelineTemplate(templateMap map[string]string, globalV
 		t   *pipelineTemplate
 		err error
 	)
+	if p.Options == nil {
+		p.Options = make(RawOptions)
+	}
 	switch p.Type {
 	case "template":
 		t, err = p.newPipelineFromTemplate(templateMap, globalVars)
@@ -66,6 +69,10 @@ func (p *pipelineRaw) newPipelineFromTemplate(templateMap map[string]string, glo
 		return nil, fmt.Errorf("%s parse pipelineTemplate yaml failed: %+w", p.TemplateName, err)
 	}
 
+	if t.Options == nil {
+		t.Options = make(RawOptions)
+	}
+
 	if err := mergo.Merge(&t.Options, p.Options, mergo.WithOverride); err != nil {
 		return nil, fmt.Errorf("%s merge template options faield: %+v", p.TemplateName, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ func (p *pipelineRaw) getPipelineTemplate(templateMap map[string]string, globalV`
`30`	`30`	`t *pipelineTemplate`
`31`	`31`	`err error`
`32`	`32`	`)`
	`33`	`+ if p.Options == nil {`
	`34`	`+ p.Options = make(RawOptions)`
	`35`	`+ }`
`33`	`36`	`switch p.Type {`
`34`	`37`	`case "template":`
`35`	`38`	`t, err = p.newPipelineFromTemplate(templateMap, globalVars)`
`@@ -66,6 +69,10 @@ func (p *pipelineRaw) newPipelineFromTemplate(templateMap map[string]string, glo`
`66`	`69`	`return nil, fmt.Errorf("%s parse pipelineTemplate yaml failed: %+w", p.TemplateName, err)`
`67`	`70`	`}`
`68`	`71`
	`72`	`+ if t.Options == nil {`
	`73`	`+ t.Options = make(RawOptions)`
	`74`	`+ }`
	`75`	`+`
`69`	`76`	`if err := mergo.Merge(&t.Options, p.Options, mergo.WithOverride); err != nil {`
`70`	`77`	`return nil, fmt.Errorf("%s merge template options faield: %+v", p.TemplateName, err)`
`71`	`78`	`}`