Merge pull request #834 from rushtehrani/fix/params

fix: Only remove whitespaces in var references
onepanelio · Jan 12, 2021 · 709871d · 709871d
2 parents 2c187ad + 1d0c898
commit 709871d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/workflow_execution.go b/pkg/workflow_execution.go
@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/watch"
 	"net/http"
+	"regexp"
 	yaml2 "sigs.k8s.io/yaml"
 	"strconv"
 	"strings"
@@ -463,11 +464,12 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
 	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.ReplaceAll(*param.Value, " ", "")
-			param.Value = &formattedValue
-			*param.Value = strings.ReplaceAll(*param.Value, "{{workflow.namespace}}", namespace)
-			*param.Value = strings.ReplaceAll(*param.Value, "{{workspace.namespace}}", namespace)
+			re, reErr := regexp.Compile(`{{\s*workflow.namespace\s*}}|{{\s*workspace.namespace\s*}}`)
+			if reErr != nil {
+				return nil, reErr
+			}
+			value := re.ReplaceAllString(*param.Value, namespace)
+			param.Value = &value
 		}
 
 		newParameters = append(newParameters, param)