fix(api): merge pipeline parameter and default value in workflow cont…

…ext (#3413)
ovh · Oct 9, 2018 · be05fef · be05fef
1 parent d5f0a83
commit be05fef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/engine/api/workflow/process.go b/engine/api/workflow/process.go
@@ -435,15 +435,15 @@ func processWorkflowNodeRun(ctx context.Context, db gorp.SqlExecutor, store cach
 			runPayload = sdk.ParametersMapMerge(runPayload, m1)
 		}
 		run.Payload = runPayload
-		run.PipelineParameters = n.Context.DefaultPipelineParameters
+		run.PipelineParameters = sdk.ParametersMerge(pip.Parameter, n.Context.DefaultPipelineParameters)
 		next()
 	}
 
 	run.HookEvent = h
 	if h != nil {
 		runPayload = sdk.ParametersMapMerge(runPayload, h.Payload)
 		run.Payload = runPayload
-		run.PipelineParameters = n.Context.DefaultPipelineParameters
+		run.PipelineParameters = sdk.ParametersMerge(pip.Parameter, n.Context.DefaultPipelineParameters)
 	}
 
 	run.BuildParameters = append(run.BuildParameters, sdk.Parameter{
@@ -466,7 +466,7 @@ func processWorkflowNodeRun(ctx context.Context, db gorp.SqlExecutor, store cach
 		}
 		runPayload = sdk.ParametersMapMerge(runPayload, m1)
 		run.Payload = runPayload
-		run.PipelineParameters = m.PipelineParameters
+		run.PipelineParameters = sdk.ParametersMerge(m.PipelineParameters, n.Context.DefaultPipelineParameters)
 		run.BuildParameters = append(run.BuildParameters, sdk.Parameter{
 			Name:  "cds.triggered_by.email",
 			Type:  sdk.StringParameter,

diff --git a/sdk/parameter.go b/sdk/parameter.go
@@ -175,6 +175,17 @@ func variablesToParameters(prefix string, variables []Variable) []Parameter {
 	return res
 }
 
+// ParametersMerge merges two slices of parameters preserving all values
+func ParametersMerge(src []Parameter, overwritter []Parameter) []Parameter {
+	params := make([]Parameter, 0, len(src)+len(overwritter))
+	params = append(params, src...)
+	for _, param := range overwritter {
+		ParameterAddOrSetValue(&params, param.Name, param.Type, param.Value)
+	}
+
+	return params
+}
+
 // ParametersMapMerge merges two maps of parameters preserving all values
 func ParametersMapMerge(params map[string]string, otherParams map[string]string) map[string]string {
 	for k, v := range otherParams {