[GitHub] [incubator-devlake] warren830 commented on a diff in pull request #4459: feat: add pipeline step for bitbucket

["warren830 (via GitHub)" <gi...@apache.org>]

warren830 commented on code in PR #4459:
URL: https://github.com/apache/incubator-devlake/pull/4459#discussion_r1111961935


##########
backend/plugins/bitbucket/tasks/pipeline_steps_convertor.go:
##########
@@ -27,74 +27,92 @@ import (
 	"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
 	"github.com/apache/incubator-devlake/plugins/bitbucket/models"
 	"reflect"
-	"time"
 )
 
-var ConvertDeploymentMeta = plugin.SubTaskMeta{
-	Name:             "convertDeployments",
-	EntryPoint:       ConvertDeployments,
+var ConvertPipelineStepMeta = plugin.SubTaskMeta{
+	Name:             "convertPipelineSteps",
+	EntryPoint:       ConvertPipelineSteps,
 	EnabledByDefault: true,
 	Description:      "Convert tool layer table bitbucket_pipeline into domain layer table pipeline",
-	DomainTypes:      []string{plugin.DOMAIN_TYPE_CROSS},
+	DomainTypes:      []string{plugin.DOMAIN_TYPE_CICD},
 }
 
-func ConvertDeployments(taskCtx plugin.SubTaskContext) errors.Error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_DEPLOYMENT_TABLE)
+func ConvertPipelineSteps(taskCtx plugin.SubTaskContext) errors.Error {
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_PIPELINE_STEPS_TABLE)
 	db := taskCtx.GetDal()
 
-	cursor, err := db.Cursor(dal.From(models.BitbucketDeployment{}))
+	deploymentPattern := data.Options.DeploymentPattern
+	productionPattern := data.Options.ProductionPattern
+	regexEnricher := api.NewRegexEnricher()
+	err := regexEnricher.AddRegexp(deploymentPattern, productionPattern)
+	if err != nil {
+		return err
+	}
+
+	cursor, err := db.Cursor(dal.From(models.BitbucketPipelineStep{}))
 	if err != nil {
 		return err
 	}
 	defer cursor.Close()
 
-	pipelineIdGen := didgen.NewDomainIdGenerator(&models.BitbucketDeployment{})
+	pipelineIdGen := didgen.NewDomainIdGenerator(&models.BitbucketPipelineStep{})
 
 	converter, err := api.NewDataConverter(api.DataConverterArgs{
-		InputRowType:       reflect.TypeOf(models.BitbucketDeployment{}),
+		InputRowType:       reflect.TypeOf(models.BitbucketPipelineStep{}),
 		Input:              cursor,
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Convert: func(inputRow interface{}) ([]interface{}, errors.Error) {
-			bitbucketDeployment := inputRow.(*models.BitbucketDeployment)
+			bitbucketPipelineStep := inputRow.(*models.BitbucketPipelineStep)
 
-			startedAt := bitbucketDeployment.CreatedOn
-			if bitbucketDeployment.StartedOn != nil {
-				startedAt = bitbucketDeployment.StartedOn
-			}
-			domainDeployment := &devops.CICDTask{
+			domainTask := &devops.CICDTask{
 				DomainEntity: domainlayer.DomainEntity{
-					Id: pipelineIdGen.Generate(data.Options.ConnectionId, bitbucketDeployment.BitbucketId),
+					Id: pipelineIdGen.Generate(data.Options.ConnectionId, bitbucketPipelineStep.BitbucketId),
 				},
-				Name: didgen.NewDomainIdGenerator(&models.BitbucketPipeline{}).
-					Generate(data.Options.ConnectionId, bitbucketDeployment.Name),
-				PipelineId: bitbucketDeployment.PipelineId,
+				Name:       bitbucketPipelineStep.Name,
+				PipelineId: bitbucketPipelineStep.PipelineId,

Review Comment:
   we should use domain if of cicd pipeline



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@devlake.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org