fix: options nil pointer error

aFlyBird0 · aFlyBird0 · commit 62634059450e · 2022-11-29T17:10:05.000+08:00
Signed-off-by: Bird &lt;aflybird0@gmail.com&gt;
diff --git a/internal/pkg/configmanager/pipelinetemplate.go b/internal/pkg/configmanager/pipelinetemplate.go
@@ -55,6 +55,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)
@@ -91,6 +94,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(&p.Options, t.Options); 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
`@@ -55,6 +55,9 @@ func (p *pipelineRaw) getPipelineTemplate(templateMap map[string]string, globalV`
`55`	`55`	`t *pipelineTemplate`
`56`	`56`	`err error`
`57`	`57`	`)`
	`58`	`+ if p.Options == nil {`
	`59`	`+ p.Options = make(RawOptions)`
	`60`	`+ }`
`58`	`61`	`switch p.Type {`
`59`	`62`	`case "template":`
`60`	`63`	`t, err = p.newPipelineFromTemplate(templateMap, globalVars)`
`@@ -91,6 +94,10 @@ func (p *pipelineRaw) newPipelineFromTemplate(templateMap map[string]string, glo`
`91`	`94`	`return nil, fmt.Errorf("%s parse pipelineTemplate yaml failed: %+w", p.TemplateName, err)`
`92`	`95`	`}`
`93`	`96`
	`97`	`+ if t.Options == nil {`
	`98`	`+ t.Options = make(RawOptions)`
	`99`	`+ }`
	`100`	`+`
`94`	`101`	`if err := mergo.Merge(&p.Options, t.Options); err != nil {`
`95`	`102`	`return nil, fmt.Errorf("%s merge template options faield: %+v", p.TemplateName, err)`
`96`	`103`	`}`