Skip to content

feat: replace parameter namespace values with runtime value #829

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

Merged
rushtehrani merged 1 commit into from
Jan 10, 2021
Merged

feat: replace parameter namespace values with runtime value #829

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
15 changes: 14 additions & 1 deletion pkg/workflow_execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
if opts == nil {
opts = &WorkflowExecutionOptions{}
}

if opts.Name != "" {
wf.ObjectMeta.Name = opts.Name
}
Expand Down Expand Up @@ -460,6 +459,20 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
wf.ObjectMeta.Labels = opts.Labels
}

newParameters := make([]wfv1.Parameter, 0)
for i := range wf.Spec.Arguments.Parameters {
param := wf.Spec.Arguments.Parameters[i]
if param.Value != nil {
// Strip out whitespace from parameter value
formattedValue := strings.Replace(*param.Value, " ", "", -1)
*param.Value = strings.Replace(formattedValue, "{{workflow.namespace}}", namespace, -1)
*param.Value = strings.Replace(*param.Value, "{{workspace.namespace}}", namespace, -1)
Copy link
Contributor

@rushtehrani rushtehrani Jan 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this use formattedValue too?

Copy link
Contributor Author

@Vafilor Vafilor Jan 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rushtehrani Do you mean the 3rd line there?

*param.Value = strings.Replace(*param.Value, "{{workspace.namespace}}", namespace, -1)

If so, no. It is correct because we replace workflow.namespace above. If we set it to formattedValue we would clear out those changes.

Copy link
Contributor

@rushtehrani rushtehrani Jan 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah got it. Minor: might be cleaner to use ReplaceAll - it calls Replace with -1 internally.

}

newParameters = append(newParameters, param)
}
wf.Spec.Arguments.Parameters = newParameters

if err = injectWorkflowExecutionStatusCaller(wf, wfv1.NodeRunning); err != nil {
return nil, err
}
Expand Down