Skip to content

Commit 7227750

Browse files
authored
fix(2878): exclude warning from merging build meta (#454)
1 parent e151a1d commit 7227750

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

launch.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,11 +524,12 @@ func launch(api screwdriver.API, buildID int, rootDir, emitterPath, metaSpace, s
524524
buildMeta["coverageKey"] = coverageInfo.EnvVars["SD_SONAR_PROJECT_KEY"]
525525
}
526526

527+
mergedBuildMeta := buildMeta
527528
if mergedMeta["build"] != nil {
528-
mergedMeta["build"] = deepMergeJSON(mergedMeta["build"].(map[string]interface{}), buildMeta)
529-
} else {
530-
mergedMeta["build"] = buildMeta
529+
mergedBuildMeta = deepMergeJSON(mergedMeta["build"].(map[string]interface{}), buildMeta)
531530
}
531+
delete(mergedBuildMeta, "warning")
532+
mergedMeta["build"] = mergedBuildMeta
532533

533534
eventMeta := map[string]interface{}{
534535
"creator": event.Creator["username"],

launch_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,6 +2557,7 @@ func TestMetaWhenStartFromAnyJobWithParentEvent(t *testing.T) {
25572557
"coverageKey": "parent_event_value", // Overwrote by default value
25582558
"parent_event_only": "parent_event_value", // Remain
25592559
"build_and_event_and_parent_event": "parent_event_value", // Remain
2560+
"warning": "parent_event_value", // Removed from merged meta
25602561
},
25612562
"event": map[string]interface{}{
25622563
"creator": "parent_event_value", // Overwrote by default value

0 commit comments

Comments
 (0)