fix(api): do not prefix non cds parameters (#4175)

ovh · Apr 10, 2019 · 81c39cb · 81c39cb
1 parent 173f46f
commit 81c39cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/engine/api/workflow/process_node_test.go b/engine/api/workflow/process_node_test.go
@@ -1316,6 +1316,7 @@ func TestGitParamOn2ApplicationSameRepo(t *testing.T) {
 	var manualEvent sdk.WorkflowNodeRunManual
 	manualEvent.Payload = map[string]string{
 		"git.branch": "feat/branch",
+		"my.value":   "bar",
 	}
 
 	opts := &sdk.WorkflowRunPostHandlerOption{
@@ -1336,13 +1337,16 @@ func TestGitParamOn2ApplicationSameRepo(t *testing.T) {
 	assert.Equal(t, "mylastcommit", mapParams["git.hash"])
 	assert.Equal(t, "steven.guiheux", mapParams["git.author"])
 	assert.Equal(t, "super commit", mapParams["git.message"])
+	assert.Equal(t, "bar", mapParams["my.value"])
 
 	mapParams2 := sdk.ParametersToMap(wr.WorkflowNodeRuns[w.WorkflowData.Node.Triggers[0].ChildNode.ID][0].BuildParameters)
 	t.Logf("%+v", mapParams2)
 	assert.Equal(t, "feat/branch", mapParams2["git.branch"])
 	assert.Equal(t, "mylastcommit", mapParams2["git.hash"])
 	assert.Equal(t, "steven.guiheux", mapParams2["git.author"])
 	assert.Equal(t, "super commit", mapParams2["git.message"])
+	assert.Equal(t, "bar", mapParams2["my.value"])
+	assert.Equal(t, "build", mapParams2["workflow.root.pipeline"])
 
 }
 

diff --git a/engine/api/workflow/process_parameters.go b/engine/api/workflow/process_parameters.go
@@ -185,8 +185,6 @@ func getParentParameters(w *sdk.WorkflowRun, nodeRuns []*sdk.WorkflowNodeRun) ([
 				// keep p.Name as is
 			} else if strings.HasPrefix(param.Name, "cds.") {
 				param.Name = strings.Replace(param.Name, "cds.", prefix, 1)
-			} else {
-				param.Name = prefix + param.Name
 			}
 			parentParams = append(parentParams, param)
 		}