Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(3234): parentevent should be a predecessor of other metadata #477

Merged
merged 2 commits into from
Nov 4, 2024
Merged

feat(3234): parentevent should be a predecessor of other metadata #477

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7ff8a7
parentevent is merged at the beginning
VonnyJap Nov 2, 2024
876976c
fixes tests
VonnyJap Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions launch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,21 @@ func launch(api screwdriver.API, buildID int, rootDir, emitterPath, metaSpace, s
return err, "", ""
}

// Always merge parent event meta if it exists (Issue #3234)
if event.ParentEventID != 0 { // If has parent event, fetch meta from parent event
log.Printf("Fetching Parent Event %d", event.ParentEventID)
parentEvent, err := api.EventFromID(event.ParentEventID)
if err != nil {
return fmt.Errorf("Fetching Parent Event ID %d: %v", event.ParentEventID, err), "", ""
}

if parentEvent.Meta != nil {
mergedMeta = deepMergeJSON(mergedMeta, parentEvent.Meta)
}

metaLog = fmt.Sprintf(`Event(%v)`, parentEvent.ID)
}

// Always merge event meta
if len(event.Meta) > 0 { // If has meta, marshal it
log.Printf("Fetching Event Meta JSON %v", event.ID)
Expand Down Expand Up @@ -501,21 +516,6 @@ func launch(api screwdriver.API, buildID int, rootDir, emitterPath, metaSpace, s
metaLog = fmt.Sprintf(`Build(%v)`, parentBuildIDs[0])
}

// Always merge parent event meta if it exists (Issue #3234)
if event.ParentEventID != 0 { // If has parent event, fetch meta from parent event
log.Printf("Fetching Parent Event %d", event.ParentEventID)
parentEvent, err := api.EventFromID(event.ParentEventID)
if err != nil {
return fmt.Errorf("Fetching Parent Event ID %d: %v", event.ParentEventID, err), "", ""
}

if parentEvent.Meta != nil {
mergedMeta = deepMergeJSON(mergedMeta, parentEvent.Meta)
}

metaLog = fmt.Sprintf(`Event(%v)`, parentEvent.ID)
}

// Initialize pr comments (Issue #1858)
if metadata, ok := mergedMeta["meta"]; ok {
delete(metadata.(map[string]interface{}), "summary")
Expand Down
8 changes: 6 additions & 2 deletions launch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,8 +1849,10 @@ func TestMetaWhenTriggeredFromPipelinesByANDLogicWithParentBuildMeta(t *testing.

eventFromIDMeta := map[string]interface{}{
"event_only": "event_value", // Remain
"event_and_parent_event": "event_value", // Remain
"build_and_event_and_inner_pipeline": "event_value", // Overwrote by inner pipeline
"build_and_event_and_external_pipeline": "event_value", // Overwrote by external pipeline
"build_and_event_and_parent_event": "event_value", // Overwrote by inner pipeline
"parameters": map[string]string{
"event_only": "event_value", // This should be deleted
"build_and_event_and_inner_pipeline": "event_value", // Overwrote by build
Expand Down Expand Up @@ -1896,7 +1898,7 @@ func TestMetaWhenTriggeredFromPipelinesByANDLogicWithParentBuildMeta(t *testing.

parentEventMeta := map[string]interface{}{
"parent_event_only": "parent_event_value", // Remain
"build_and_event_and_parent_event": "parent_event_value", // Remain
"build_and_event_and_parent_event": "parent_event_value", // Overwrote by inner pipeline
"parameters": map[string]string{
"parent_event_only": "parent_event_value", // This should be deleted
"build_and_event_and_parent_event": "parent_event_value", // Overwrote by build
Expand Down Expand Up @@ -1929,6 +1931,7 @@ func TestMetaWhenTriggeredFromPipelinesByANDLogicWithParentBuildMeta(t *testing.
innerParentBuildMeta := map[string]interface{}{
"inner_pipeline_only": "inner_pipeline_value", // Remain
"build_and_event_and_inner_pipeline": "inner_pipeline_value", // Remain
"build_and_event_and_parent_event": "inner_pipeline_value", // Remain
"parameters": map[string]string{
"inner_pipeline_only": "inner_pipeline_value", // This should be deleted
"build_and_event_and_inner_pipeline": "inner_pipeline_value", // Overwrote by build
Expand Down Expand Up @@ -2065,8 +2068,9 @@ func TestMetaWhenTriggeredFromPipelinesByANDLogicWithParentBuildMeta(t *testing.
"inner_pipeline_only": "inner_pipeline_value",
"build_and_event_and_inner_pipeline": "inner_pipeline_value",
"build_and_event_and_external_pipeline": "external_pipeline_value",
"build_and_event_and_parent_event": "parent_event_value",
"build_and_event_and_parent_event": "inner_pipeline_value",
"parent_event_only": "parent_event_value",
"event_and_parent_event": "event_value",
"build":{
"buildId": "%d",
"jobId": "%d",
Expand Down