Skip to content

Commit 2ddf723

Browse files
authored
fix global default parameter not rendered when some job task content is generate after rendering (#4506)
Signed-off-by: Min Min <jamsman94@gmail.com>
1 parent a3e617e commit 2ddf723

File tree

1 file changed

+12
-1
lines changed
  • pkg/microservice/aslan/core/workflow/service/workflow/controller

1 file changed

+12
-1
lines changed

pkg/microservice/aslan/core/workflow/service/workflow/controller/workflow.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,19 @@ func (w *Workflow) ToJobTasks(taskID int64, creator, account, uid string) ([]*co
153153
}
154154
}
155155

156+
workflowDefaultParams, err := w.getWorkflowDefaultParams(taskID, creator, account, uid)
157+
for _, param := range workflowDefaultParams {
158+
if param.GetValue() != "" && !strings.HasPrefix(param.GetValue(), "{{.") {
159+
globalKeyMap[param.Name] = param.GetValue()
160+
log.Debugf("insert key %s with value %s", param.Name, param.GetValue())
161+
} else {
162+
log.Warnf("key %s skipped due to no value or reference value: [%s]", param.Name, param.GetValue())
163+
}
164+
}
165+
156166
// then we render the workflow with the built-in & user-defined parameter
157-
err := w.RenderWorkflowDefaultParams(taskID, creator, account, uid)
167+
// TODO: this is probably deprecated due because we already render the workflow default params in the previous loop
168+
err = w.RenderWorkflowDefaultParams(taskID, creator, account, uid)
158169
if err != nil {
159170
return nil, err
160171
}

0 commit comments

Comments
 (0)