Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions models/blueprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ func (Blueprint) TableName() string {
type BlueprintSettings struct {
Version string `json:"version" validate:"required,semver,oneof=1.0.0"`
Connections json.RawMessage `json:"connections" validate:"required"`
BeforePlan json.RawMessage `json:"before_plan"`
AfterPlan json.RawMessage `json:"after_plan"`
}

// UnmarshalPlan unmarshals Plan in JSON to strong-typed core.PipelinePlan
Expand Down
29 changes: 28 additions & 1 deletion services/blueprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,34 @@ func GeneratePlanJsonV100(settings *models.BlueprintSettings) (core.PipelinePlan
return nil, fmt.Errorf("plugin %s does not support blueprint protocol version 1.0.0", connection.Plugin)
}
}
return MergePipelinePlans(plans...), nil

mergedPipelinePlan := MergePipelinePlans(plans...)
return FormatPipelinePlans(settings.BeforePlan, mergedPipelinePlan, settings.AfterPlan)
}

// FormatPipelinePlans merges multiple pipelines and append before and after pipeline
func FormatPipelinePlans(beforePlanJson json.RawMessage, mainPlan core.PipelinePlan, afterPlanJson json.RawMessage) (core.PipelinePlan, error) {
newPipelinePlan := core.PipelinePlan{}
if beforePlanJson != nil {
beforePipelinePlan := core.PipelinePlan{}
err := json.Unmarshal(beforePlanJson, &beforePipelinePlan)
if err != nil {
return nil, err
}
newPipelinePlan = append(newPipelinePlan, beforePipelinePlan...)
}

newPipelinePlan = append(newPipelinePlan, mainPlan...)

if afterPlanJson != nil {
afterPipelinePlan := core.PipelinePlan{}
err := json.Unmarshal(afterPlanJson, &afterPipelinePlan)
if err != nil {
return nil, err
}
newPipelinePlan = append(newPipelinePlan, afterPipelinePlan...)
}
return newPipelinePlan, nil
}

// MergePipelinePlans merges multiple pipelines into one unified pipeline
Expand Down
43 changes: 43 additions & 0 deletions services/blueprint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ limitations under the License.
package services

import (
"encoding/json"
"testing"

"github.com/apache/incubator-devlake/plugins/core"
Expand Down Expand Up @@ -92,3 +93,45 @@ func TestMergePipelineTasks(t *testing.T) {
MergePipelinePlans(plan1, plan2, plan3),
)
}

func TestFormatPipelinePlans(t *testing.T) {
beforePlan2 := json.RawMessage(`[[{"plugin":"github"},{"plugin":"gitlab"}],[{"plugin":"gitextractor1"},{"plugin":"gitextractor2"}]]`)

mainPlan := core.PipelinePlan{
{
{Plugin: "jira"},
},
}

afterPlan2 := json.RawMessage(`[[{"plugin":"jenkins"}],[{"plugin":"jenkins"}]]`)

result1, err1 := FormatPipelinePlans(nil, mainPlan, nil)
assert.Nil(t, err1)
assert.Equal(t, mainPlan, result1)

result2, err2 := FormatPipelinePlans(beforePlan2, mainPlan, afterPlan2)
assert.Nil(t, err2)
assert.Equal(t, core.PipelinePlan{
{
{Plugin: "github"},
{Plugin: "gitlab"},
},
{
{Plugin: "gitextractor1"},
{Plugin: "gitextractor2"},
},
{
{Plugin: "jira"},
},
{
{Plugin: "jenkins"},
},
{
{Plugin: "jenkins"},
},
}, result2)

result3, err3 := FormatPipelinePlans(json.RawMessage("[]"), mainPlan, json.RawMessage("[]"))
assert.Nil(t, err3)
assert.Equal(t, mainPlan, result3)
}