8000 fix(api): add git param with prefix for children (#4189) · ovh/cds@43798f0 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 43798f0

Browse files
sguiheuxrichardlt
sguiheux
authored and
richardlt
committed
fix(api): add git param with prefix for children (#4189)
1 parent 75cf412 commit 43798f0

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

‎engine/api/workflow/process_node_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,13 +823,15 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
823823
assert.Equal(t, "defaultCommit", mapParams2["git.hash"])
824824
assert.Equal(t, "john.snow", mapParams2["git.author"])
825825
assert.Equal(t, "super default commit", mapParams2["git.message"])
826+
assert.Equal(t, "mylastcommit", mapParams2["workflow.root.git.hash"])
826827
assert.Equal(t, "stash", wr.WorkflowNodeRuns[w.WorkflowData.Node.Triggers[0].ChildNode.ID][0].VCSServer)
827828

828829
mapParams3 := sdk.ParametersToMap(wr.WorkflowNodeRuns[w.WorkflowData.Node.Triggers[0].ChildNode.Triggers[0].ChildNode.ID][0].BuildParameters)
829830
assert.Equal(t, "feat/branch", mapParams3["git.branch"])
830831
assert.Equal(t, "mylastcommit", mapParams3["git.hash"])
831832
assert.Equal(t, "steven.guiheux", mapParams3["git.author"])
832833
assert.Equal(t, "super commit", mapParams3["git.message"])
834+
assert.Equal(t, "defaultBranch", mapParams3["workflow.child1.git.branch"])
833835
assert.Equal(t, "github", wr.WorkflowNodeRuns[w.WorkflowData.Node.Triggers[0].ChildNode.Triggers[0].ChildNode.ID][0].VCSServer)
834836
}
835837

‎engine/api/workflow/process_parameters.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func getParentParameters(w *sdk.WorkflowRun, nodeRuns []*sdk.WorkflowNodeRun) ([
161161

162162
parentParams := make([]sdk.Parameter, 0, len(parentNodeRun.BuildParameters))
163163
for _, param := range parentNodeRun.BuildParameters {
164-
164+
prefix := "workflow." + nodeName + "."
165165
if param.Name == "" || param.Name == "cds.semver" || param.Name == "cds.release.version" ||
166166
strings.HasPrefix(param.Name, "cds.proj") ||
167167
strings.HasPrefix(param.Name, "cds.version") || strings.HasPrefix(param.Name, "cds.run.number") ||
@@ -177,15 +177,17 @@ func getParentParameters(w *sdk.WorkflowRun, nodeRuns []*sdk.WorkflowNodeRun) ([
177177
// We inherite git variables is there is more than one repositories in the whole workflow
178178
if strings.HasPrefix(param.Name, "git.") {
179179
parentParams = append(parentParams, param)
180+
181+
// Create parent param
182+
param.Name = prefix + param.Name
183+
parentParams = append(parentParams, param)
180184
continue
181185
}
182186
if strings.HasPrefix(param.Name, "gerrit.") {
183187
parentParams = append(parentParams, param)
184188
continue
185189
}
186190

187-
prefix := "workflow." + nodeName + "."
188-
189191
if param.Name == "payload" || strings.HasPrefix(param.Name, "cds.triggered") {
190192
// keep p.Name as is
191193
} else if strings.HasPrefix(param.Name, "cds.") {

0 commit comments

Comments
 (0)
0