fix(2878): exclude warning from merging build meta (#454)

screwdriver-cd · Jul 25, 2023 · 7227750 · 7227750
1 parent e151a1d
commit 7227750
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/launch.go b/launch.go
@@ -524,11 +524,12 @@ func launch(api screwdriver.API, buildID int, rootDir, emitterPath, metaSpace, s
 		buildMeta["coverageKey"] = coverageInfo.EnvVars["SD_SONAR_PROJECT_KEY"]
 	}
 
+	mergedBuildMeta := buildMeta
 	if mergedMeta["build"] != nil {
-		mergedMeta["build"] = deepMergeJSON(mergedMeta["build"].(map[string]interface{}), buildMeta)
-	} else {
-		mergedMeta["build"] = buildMeta
+		mergedBuildMeta = deepMergeJSON(mergedMeta["build"].(map[string]interface{}), buildMeta)
 	}
+	delete(mergedBuildMeta, "warning")
+	mergedMeta["build"] = mergedBuildMeta
 
 	eventMeta := map[string]interface{}{
 		"creator": event.Creator["username"],

diff --git a/launch_test.go b/launch_test.go
@@ -2557,6 +2557,7 @@ func TestMetaWhenStartFromAnyJobWithParentEvent(t *testing.T) {
 			"coverageKey":                      "parent_event_value", // Overwrote by default value
 			"parent_event_only":                "parent_event_value", // Remain
 			"build_and_event_and_parent_event": "parent_event_value", // Remain
+			"warning":                          "parent_event_value", // Removed from merged meta
 		},
 		"event": map[string]interface{}{
 			"creator": "parent_event_value", // Overwrote by default value