This is an automated email from the ASF dual-hosted git repository. abeizn pushed a commit to tag revert-dora-empty-v20240229-6 in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 4823fc326524180323490b379e5d3d8fabd7c660 Author: abeizn <[email protected]> AuthorDate: Thu Mar 7 11:48:59 2024 +0800 Revert "fix: cicd deployment dora delete when data nil (#7033) (#7044)" This reverts commit ec3eaf0f1c4f7147d9e88b8f501206f45d5c851d. --- .../plugins/dora/tasks/change_lead_time_calculator.go | 19 ++----------------- .../dora/tasks/deployment_commits_generator.go | 13 ------------- backend/plugins/dora/tasks/deployment_generator.go | 14 -------------- .../plugins/dora/tasks/incident_deploy_connector.go | 14 -------------- backend/plugins/github_graphql/tasks/pr_extractor.go | 2 ++ 5 files changed, 4 insertions(+), 58 deletions(-) diff --git a/backend/plugins/dora/tasks/change_lead_time_calculator.go b/backend/plugins/dora/tasks/change_lead_time_calculator.go index dc5134cbe..f36303b8c 100644 --- a/backend/plugins/dora/tasks/change_lead_time_calculator.go +++ b/backend/plugins/dora/tasks/change_lead_time_calculator.go @@ -18,7 +18,6 @@ limitations under the License. package tasks import ( - "fmt" "math" "reflect" "time" @@ -49,30 +48,16 @@ func CalculateChangeLeadTime(taskCtx plugin.SubTaskContext) errors.Error { data := taskCtx.GetData().(*DoraTaskData) // Get pull requests by repo project_name - var clauses = []dal.Clause{ + cursor, err := db.Cursor( dal.Select("pr.id, pr.pull_request_key, pr.author_id, pr.merge_commit_sha, pr.created_date, pr.merged_date"), dal.From("pull_requests pr"), dal.Join(`LEFT JOIN project_mapping pm ON (pm.row_id = pr.base_repo_id)`), dal.Where("pr.merged_date IS NOT NULL AND pm.project_name = ? AND pm.table = 'repos'", data.Options.ProjectName), - } - cursor, err := db.Cursor(clauses...) + ) if err != nil { return err } defer cursor.Close() - count, err := db.Count(clauses...) - if err != nil { - return errors.Default.Wrap(err, "error getting count of clauses") - } - if count == 0 { - // Clear previous results from the project - deleteSql := fmt.Sprintf("DELETE FROM project_pr_metrics WHERE project_name = '%s'", data.Options.ProjectName) - err := db.Exec(deleteSql) - if err != nil { - return errors.Default.Wrap(err, "error deleting previous project_pr_metrics") - } - return nil - } converter, err := api.NewDataConverter(api.DataConverterArgs{ RawDataSubTaskArgs: api.RawDataSubTaskArgs{ diff --git a/backend/plugins/dora/tasks/deployment_commits_generator.go b/backend/plugins/dora/tasks/deployment_commits_generator.go index d960f5785..85da0e5fe 100644 --- a/backend/plugins/dora/tasks/deployment_commits_generator.go +++ b/backend/plugins/dora/tasks/deployment_commits_generator.go @@ -112,19 +112,6 @@ func GenerateDeploymentCommits(taskCtx plugin.SubTaskContext) errors.Error { return err } defer cursor.Close() - count, err := db.Count(clauses...) - if err != nil { - return errors.Default.Wrap(err, "error getting count of clauses") - } - if count == 0 { - // Clear previous results from the project - deleteSql := fmt.Sprintf("DELETE cdc FROM cicd_deployment_commits cdc LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cdc.cicd_scope_id) WHERE pm.project_name = '%s'", data.Options.ProjectName) - err := db.Exec(deleteSql) - if err != nil { - return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits") - } - return nil - } enricher, err := api.NewDataConverter(api.DataConverterArgs{ RawDataSubTaskArgs: api.RawDataSubTaskArgs{ diff --git a/backend/plugins/dora/tasks/deployment_generator.go b/backend/plugins/dora/tasks/deployment_generator.go index f7caada5e..3ae9da7e6 100644 --- a/backend/plugins/dora/tasks/deployment_generator.go +++ b/backend/plugins/dora/tasks/deployment_generator.go @@ -18,7 +18,6 @@ limitations under the License. package tasks import ( - "fmt" "reflect" "time" @@ -91,19 +90,6 @@ func GenerateDeployment(taskCtx plugin.SubTaskContext) errors.Error { return err } defer cursor.Close() - count, err := db.Count(clauses...) - if err != nil { - return errors.Default.Wrap(err, "error getting count of clauses") - } - if count == 0 { - // Clear previous results from the project - deleteSql := fmt.Sprintf("DELETE cd FROM cicd_deployments cd LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cd.cicd_scope_id) WHERE pm.project_name = '%s'", data.Options.ProjectName) - err := db.Exec(deleteSql) - if err != nil { - return errors.Default.Wrap(err, "error deleting previous deployments") - } - return nil - } enricher, err := api.NewDataConverter(api.DataConverterArgs{ RawDataSubTaskArgs: api.RawDataSubTaskArgs{ diff --git a/backend/plugins/dora/tasks/incident_deploy_connector.go b/backend/plugins/dora/tasks/incident_deploy_connector.go index f2903d03c..cb013503a 100644 --- a/backend/plugins/dora/tasks/incident_deploy_connector.go +++ b/backend/plugins/dora/tasks/incident_deploy_connector.go @@ -18,7 +18,6 @@ limitations under the License. package tasks import ( - "fmt" "reflect" "time" @@ -63,19 +62,6 @@ func ConnectIncidentToDeployment(taskCtx plugin.SubTaskContext) errors.Error { return err } defer cursor.Close() - count, err := db.Count(clauses...) - if err != nil { - return errors.Default.Wrap(err, "error getting count of clauses") - } - if count == 0 { - // Clear previous results from the project - deleteSql := fmt.Sprintf("DELETE FROM project_issue_metrics WHERE project_name = '%s'", data.Options.ProjectName) - err := db.Exec(deleteSql) - if err != nil { - return errors.Default.Wrap(err, "error deleting previous project_issue_metrics") - } - return nil - } enricher, err := api.NewDataConverter(api.DataConverterArgs{ RawDataSubTaskArgs: api.RawDataSubTaskArgs{ diff --git a/backend/plugins/github_graphql/tasks/pr_extractor.go b/backend/plugins/github_graphql/tasks/pr_extractor.go index fd90d1f99..9abcc4a06 100644 --- a/backend/plugins/github_graphql/tasks/pr_extractor.go +++ b/backend/plugins/github_graphql/tasks/pr_extractor.go @@ -19,6 +19,7 @@ package tasks import ( "encoding/json" + "fmt" "regexp" "github.com/apache/incubator-devlake/core/errors" @@ -52,6 +53,7 @@ func ExtractPrs(taskCtx plugin.SubTaskContext) errors.Error { } } if config != nil && len(config.PrComponent) > 0 { + fmt.Println("config.PrComponent1", config.PrComponent) labelComponentRegex, err = errors.Convert01(regexp.Compile(config.PrComponent)) if err != nil { return errors.Default.Wrap(err, "regexp Compile prComponent failed")
