You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2024/09/24 02:39:18 UTC
(incubator-devlake) branch zk-0924 updated (f5d805a6c -> 0ba7234a4)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a change to branch zk-0924
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
from f5d805a6c fix: cannot check in bamboo cicd
new 897130608 fix: bamboo using api client in tool/domain layer
new 0ba7234a4 fix: bamboo using api client in tool/domain layer
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
backend/plugins/bamboo/impl/impl.go | 4 ----
.../deploy_build_to_deployment_commit_convertor.go | 6 +++---
.../plugins/jira/tasks/board_filter_begin_collector.go | 17 +++++++++++++++++
.../plugins/jira/tasks/board_filter_end_collector.go | 4 ++++
4 files changed, 24 insertions(+), 7 deletions(-)
(incubator-devlake) 01/02: fix: bamboo using api client in tool/domain layer
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch zk-0924
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 897130608a0397a67de2445d588ac32f439eee5c
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue Sep 24 10:37:03 2024 +0800
fix: bamboo using api client in tool/domain layer
---
backend/plugins/bamboo/impl/impl.go | 4 ----
.../bamboo/tasks/deploy_build_to_deployment_commit_convertor.go | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/backend/plugins/bamboo/impl/impl.go b/backend/plugins/bamboo/impl/impl.go
index 0ac41bbd8..b90331df1 100644
--- a/backend/plugins/bamboo/impl/impl.go
+++ b/backend/plugins/bamboo/impl/impl.go
@@ -160,11 +160,7 @@ func (p Bamboo) PrepareTaskData(taskCtx plugin.TaskContext, options map[string]i
if err != nil {
return nil, err
}
-
op.ScopeConfigId = scope.ScopeConfigId
- if err != nil {
- return nil, errors.Default.Wrap(err, fmt.Sprintf("fail to find plan: %s", op.PlanKey))
- }
}
if op.BambooScopeConfig == nil && op.ScopeConfigId != 0 {
diff --git a/backend/plugins/bamboo/tasks/deploy_build_to_deployment_commit_convertor.go b/backend/plugins/bamboo/tasks/deploy_build_to_deployment_commit_convertor.go
index 9dc4600ef..4a68b0e8e 100644
--- a/backend/plugins/bamboo/tasks/deploy_build_to_deployment_commit_convertor.go
+++ b/backend/plugins/bamboo/tasks/deploy_build_to_deployment_commit_convertor.go
@@ -146,7 +146,7 @@ func ConvertDeployBuildsToDeploymentCommits(taskCtx plugin.SubTaskContext) error
RepoId: strconv.Itoa(input.RepositoryId),
DisplayTitle: input.GenerateCICDDeploymentCommitName(),
}
- u, err := url.Parse(data.ApiClient.GetEndpoint())
+ u, err := url.Parse(data.EndPoint)
if err != nil {
log.Fatal(err)
}
@@ -162,9 +162,9 @@ func ConvertDeployBuildsToDeploymentCommits(taskCtx plugin.SubTaskContext) error
duration := float64(input.FinishedDate.Sub(*input.ExecutedDate).Milliseconds() / 1e3)
deploymentCommit.DurationSec = &duration
}
- fakeRepoUrl, err := generateFakeRepoUrl(data.ApiClient.GetEndpoint(), input.RepositoryId)
+ fakeRepoUrl, err := generateFakeRepoUrl(data.EndPoint, input.RepositoryId)
if err != nil {
- logger.Warn(err, "generate fake repo url, endpoint: %s, repo id: %d", data.ApiClient.GetEndpoint(), input.RepositoryId)
+ logger.Warn(err, "generate fake repo url, endpoint: %s, repo id: %d", data.EndPoint, input.RepositoryId)
} else {
deploymentCommit.RepoUrl = fakeRepoUrl
}
(incubator-devlake) 02/02: fix: bamboo using api client in tool/domain layer
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch zk-0924
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 0ba7234a415d2bb5f44a0fcb620cbef05f9cf6ce
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue Sep 24 10:39:05 2024 +0800
fix: bamboo using api client in tool/domain layer
---
.../plugins/jira/tasks/board_filter_begin_collector.go | 17 +++++++++++++++++
.../plugins/jira/tasks/board_filter_end_collector.go | 4 ++++
2 files changed, 21 insertions(+)
diff --git a/backend/plugins/jira/tasks/board_filter_begin_collector.go b/backend/plugins/jira/tasks/board_filter_begin_collector.go
index 6c513f1f8..60215c487 100644
--- a/backend/plugins/jira/tasks/board_filter_begin_collector.go
+++ b/backend/plugins/jira/tasks/board_filter_begin_collector.go
@@ -88,6 +88,7 @@ func CollectBoardFilterBegin(taskCtx plugin.SubTaskContext) errors.Error {
}
// change
if record.Jql != jql {
+<<<<<<< Updated upstream
cfg := taskCtx.GetConfigReader()
flag := cfg.GetBool("JIRA_JQL_AUTO_FULL_REFRESH")
if flag {
@@ -101,6 +102,22 @@ func CollectBoardFilterBegin(taskCtx plugin.SubTaskContext) errors.Error {
}
} else {
return errors.Default.New(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
+=======
+ logger.Info("connection_id:%d board_id:%d filter jql has changed, And the previous jql is %s, now jql is %s, run it in fullSync mode", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql)
+ // set full sync
+ taskCtx.TaskContext().SetSyncPolicy(&coreModels.SyncPolicy{TriggerSyncPolicy: coreModels.TriggerSyncPolicy{FullSync: true}})
+ record.Jql = jql
+ err = db.Update(&record, dal.Where("connection_id = ? AND board_id = ? ", data.Options.ConnectionId, data.Options.BoardId))
+ if err != nil {
+ return errors.Default.Wrap(err, fmt.Sprintf("error updating record in _tool_jira_boards table for connection_id:%d board_id:%d", data.Options.ConnectionId, data.Options.BoardId))
+ }
+ // update pipeline
+ pipeline := &coreModels.Pipeline{}
+
+ err := db.Update(pipeline, dal.Where("id = ?", data.Options))
+ if err != nil {
+ return errors.BadInput.New("pipeline not found")
+>>>>>>> Stashed changes
}
}
// no change
diff --git a/backend/plugins/jira/tasks/board_filter_end_collector.go b/backend/plugins/jira/tasks/board_filter_end_collector.go
index 65d8eca14..6f939068c 100644
--- a/backend/plugins/jira/tasks/board_filter_end_collector.go
+++ b/backend/plugins/jira/tasks/board_filter_end_collector.go
@@ -64,11 +64,15 @@ func CollectBoardFilterEnd(taskCtx plugin.SubTaskContext) errors.Error {
logger.Info("get board filter jql:%s", record.Jql)
if record.Jql != jql {
+<<<<<<< Updated upstream
cfg := taskCtx.GetConfigReader()
flag := cfg.GetBool("JIRA_JQL_AUTO_FULL_REFRESH")
if !flag {
return errors.Default.New(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
}
+=======
+ logger.Info(fmt.Sprintf("connection_id:%d board_id:%d filter jql has changed, please use fullSync mode. And the previous jql is %s, now jql is %s", data.Options.ConnectionId, data.Options.BoardId, record.Jql, jql))
+>>>>>>> Stashed changes
}
return nil