fix(3125): merge parent build meta order by end time

[y-oksaku]

Context

Currently, if the parent builds have same key metadata, the value of the build completed earlier is used.
(Not value of the build completed later)

This behavior is a little strange.

Objective

Sort merging parent builds metadata order by their finished time.

References

screwdriver-cd/screwdriver#3125 (comment)

License

I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.

[VonnyJap]

Suggested change

	var join = len(parentBuildIds) > 1
	var isJoin = len(parentBuildIds) > 1

[VonnyJap]

please separate this logic to a different function, for example:

func handleExternalPipelineMeta(api screwdriver.API, parentBuild screwdriver.Build, parentJob screwdriver.Job, resultMeta map[string]interface{}, metaSpace, metaLog string, isJoin bool) (map[string]interface{}, error) {
    externalMetaFile := ExternalMetaFilePrefix + strconv.Itoa(parentJob.PipelineID) + ":" + parentJob.Name + ExternalMetaFileSuffix
    writeMetafile(metaSpace, externalMetaFile, metaLog, parentBuild.Meta)

    if isJoin {
        marshallValue, err := json.Marshal(parentBuild.Meta)
        if err != nil {
            return resultMeta, fmt.Errorf("Cloning meta of Parent Build ID %d: %v", parentBuild.ID, err)
        }
        var externalParentBuildMeta map[string]interface{}
        json.Unmarshal(marshallValue, &externalParentBuildMeta)
        delete(externalParentBuildMeta, "parameters")
        resultMeta = deepMergeJSON(resultMeta, externalParentBuildMeta)
    }

    pIDString := strconv.Itoa(parentJob.PipelineID)
    pjn := parentJob.Name
    if sdMeta, ok := resultMeta["sd"]; ok {
        if externalPipelineMeta, ok := sdMeta.(map[string]interface{})[pIDString]; ok {
            if _, ok := externalPipelineMeta.(map[string]interface{})[pjn]; ok {
                delete(externalPipelineMeta.(map[string]interface{}), pjn)
            }
        }
    }

    return resultMeta, nil
}

this will help the code to be more readable.

[y-oksaku]

Thank you for the suggestion. I fixed it 🙇

[yk634]

[nits] I think it's a spelling mistake.

Suggested change

	return resultMeta, fmt.Errorf("Mergeing meta of External Parent Build ID %d: %v", parentBuild.ID, err)
	return resultMeta, fmt.Errorf("Merging meta of External Parent Build ID %d: %v", parentBuild.ID, err)

[yk634]

[nits] In other places it is “parentBuildIDs”, so it might be better to be consistent.

Suggested change

	func setParentBuildsMeta(api screwdriver.API, pipelineID int, parentBuildIds []int, mergedMeta map[string]interface{}, metaSpace, metaLog string) (map[string]interface{}, error) {
	func setParentBuildsMeta(api screwdriver.API, pipelineID int, parentBuildIDs []int, mergedMeta map[string]interface{}, metaSpace, metaLog string) (map[string]interface{}, error) {

[VonnyJap]

@y-oksaku - please rebase your branch and I will approve after that.