You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2024/05/16 09:10:57 UTC
(incubator-devlake) branch kw-5519-remoteapi-dshelper updated (1feef512a -> 614a6ce0c)
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a change to branch kw-5519-remoteapi-dshelper
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
from 1feef512a fix: connection listing is working now
add 885357769 refactor: add ipv6 test cases for api client blacklist feature (#7455)
add 8baef4f27 fix: jira worklog collector fetches only the 1st page (#7466)
add 05160fe45 fix: patch api error messages optimize (#7467)
add 57acac81f feat(githubgraphql): add releases (#7469)
add 2a052dee8 fix(apikey): abort request if api key doesn't match (#7471)
add 3dd13fad3 fix: related projects error when updating scope config (#7472)
add ccb7d93e7 Add commit_sha to github_releases and cicd_releases. (#7473)
add 79a2bb36d fix: update webhook API (#7474)
add 153f7b9ab fix: should not throw error on any shallow cloned repo (#7475)
add 3ae23bfdd fix(jenkins): incorrect class type on multibranch jobs (#7464)
add e24102f29 fix: sonarqube nextPageToken always empty (#7477)
new 6168261fa Merge remote-tracking branch 'origin/main' into kw-5519-remoteapi-dshelper
new 614a6ce0c fix: jira dshelper
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:
.../domainlayer/devops/cicd_deployment_commit.go | 6 +-
.../issue_changelog.go => devops/cicd_release.go} | 40 +++---
.../models/domainlayer/domaininfo/domaininfo.go | 1 +
...ments_table.go => 20240514_add_cicd_release.go} | 60 +++++----
.../20240515_add_commit_sha_to_cicd_release.go} | 24 ++--
backend/core/models/migrationscripts/register.go | 2 +
backend/helpers/e2ehelper/data_flow_tester.go | 5 +-
.../helpers/pluginhelper/api/api_client_test.go | 36 ++++-
.../pluginhelper/api/ds_model_api_helper.go | 9 +-
.../helpers/srvhelper/any_model_service_helper.go | 2 +-
.../srvhelper/typed_scope_service_helper.go | 2 +-
backend/impls/context/default_subtask_context.go | 6 +-
.../plugins/gitextractor/parser/clone_gitcli.go | 9 +-
backend/plugins/gitextractor/tasks/repo_cloner.go | 5 +-
backend/plugins/github/impl/impl.go | 1 +
.../20240514_add_github_release.go | 66 +++++++++
.../20240515_add_release_commit_sha.go} | 24 ++--
.../github/models/migrationscripts/register.go | 2 +
backend/plugins/github/models/release.go | 51 +++++++
backend/plugins/github/tasks/release_convertor.go | 104 ++++++++++++++
backend/plugins/github_graphql/impl/impl.go | 5 +
...eployment_collector.go => release_collector.go} | 118 ++++++++--------
...eployment_extractor.go => release_extractor.go} | 75 ++++++-----
.../e2e/{builds_test.go => multibranch_test.go} | 120 +++++++++++------
.../_raw_jenkins_api_builds_multibranch.csv | 30 ++---
.../_raw_jenkins_api_stages_multibranch.csv | 130 +++++++++---------
.../_tool_jenkins_build_commits_multibranch.csv | 26 ++--
.../_tool_jenkins_builds_multibranch.csv | 32 ++---
...ool_jenkins_builds_multibranch_after_enrich.csv | 16 +++
.../_tool_jenkins_stages_multibranch.csv | 130 +++++++++---------
.../cicd_pipeline_commits_multibranch.csv | 26 ++--
.../snapshot_tables/cicd_pipelines_multibranch.csv | 32 ++---
.../e2e/snapshot_tables/cicd_tasks_multibranch.csv | 71 +---------
backend/plugins/jenkins/tasks/build_extractor.go | 2 +-
.../_tool_jira_issues_for_external_epics.csv | 8 +-
backend/plugins/jira/models/issue.go | 1 +
.../20240514_add_worklog_total_to_issue.go} | 39 +++---
.../jira/models/migrationscripts/register.go | 1 +
backend/plugins/jira/tasks/apiv2models/issue.go | 3 +
backend/plugins/jira/tasks/worklog_collector.go | 32 ++---
backend/plugins/sonarqube/api/remote_api.go | 7 +
backend/plugins/webhook/api/deployments.go | 141 +++++++++----------
backend/server/api/middlewares.go | 1 +
config-ui/src/api/scope/index.ts | 6 +-
.../src/plugins/components/scope-config/index.tsx | 150 +++++++++++++++++----
.../register/webhook/components/create-dialog.tsx | 4 +-
.../register/webhook/components/view-dialog.tsx | 4 +-
.../routes/blueprint/connection-detail/index.tsx | 8 +-
.../routes/blueprint/connection-detail/table.tsx | 87 +++++-------
config-ui/src/routes/connection/connection.tsx | 68 +---------
50 files changed, 1050 insertions(+), 778 deletions(-)
copy backend/core/models/domainlayer/{ticket/issue_changelog.go => devops/cicd_release.go} (55%)
copy backend/core/models/migrationscripts/{20230831_add_cicd_deployments_table.go => 20240514_add_cicd_release.go} (53%)
copy backend/{plugins/teambition/models/migrationscripts/20240417_add_scope_config_id.go => core/models/migrationscripts/20240515_add_commit_sha_to_cicd_release.go} (65%)
create mode 100644 backend/plugins/github/models/migrationscripts/20240514_add_github_release.go
copy backend/plugins/{jira/models/migrationscripts/20230512_add_repo_url.go => github/models/migrationscripts/20240515_add_release_commit_sha.go} (67%)
create mode 100644 backend/plugins/github/models/release.go
create mode 100644 backend/plugins/github/tasks/release_convertor.go
copy backend/plugins/github_graphql/tasks/{deployment_collector.go => release_collector.go} (53%)
copy backend/plugins/github_graphql/tasks/{deployment_extractor.go => release_extractor.go} (51%)
copy backend/plugins/jenkins/e2e/{builds_test.go => multibranch_test.go} (58%)
create mode 100644 backend/plugins/jenkins/e2e/snapshot_tables/_tool_jenkins_builds_multibranch_after_enrich.csv
copy backend/{core/models/migrationscripts/20221201_add_enable_to_project_metric.go => plugins/jira/models/migrationscripts/20240514_add_worklog_total_to_issue.go} (56%)
(incubator-devlake) 01/02: Merge remote-tracking branch 'origin/main' into kw-5519-remoteapi-dshelper
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch kw-5519-remoteapi-dshelper
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 6168261fa303af4cd925524d9f020000ee032611
Merge: 1feef512a e24102f29
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Thu May 16 16:37:19 2024 +0800
Merge remote-tracking branch 'origin/main' into kw-5519-remoteapi-dshelper
.../domainlayer/devops/cicd_deployment_commit.go | 6 +-
.../core/models/domainlayer/devops/cicd_release.go | 53 ++++++
.../models/domainlayer/domaininfo/domaininfo.go | 1 +
.../migrationscripts/20240514_add_cicd_release.go | 69 +++++++
.../20240515_add_commit_sha_to_cicd_release.go} | 52 +++---
backend/core/models/migrationscripts/register.go | 2 +
backend/helpers/e2ehelper/data_flow_tester.go | 5 +-
.../helpers/pluginhelper/api/api_client_test.go | 36 +++-
.../helpers/srvhelper/any_model_service_helper.go | 2 +-
backend/impls/context/default_subtask_context.go | 6 +-
.../plugins/gitextractor/parser/clone_gitcli.go | 9 +-
backend/plugins/gitextractor/tasks/repo_cloner.go | 5 +-
backend/plugins/github/impl/impl.go | 1 +
.../20240514_add_github_release.go | 66 +++++++
.../20240515_add_release_commit_sha.go | 46 +++++
.../github/models/migrationscripts/register.go | 2 +
backend/plugins/github/models/release.go | 51 +++++
backend/plugins/github/tasks/release_convertor.go | 104 +++++++++++
backend/plugins/github_graphql/impl/impl.go | 5 +
.../github_graphql/tasks/release_collector.go | 137 ++++++++++++++
.../github_graphql/tasks/release_extractor.go | 106 +++++++++++
backend/plugins/jenkins/e2e/multibranch_test.go | 206 +++++++++++++++++++++
.../_raw_jenkins_api_builds_multibranch.csv | 30 +--
.../_raw_jenkins_api_stages_multibranch.csv | 130 ++++++-------
.../_tool_jenkins_build_commits_multibranch.csv | 26 +--
.../_tool_jenkins_builds_multibranch.csv | 32 ++--
...ool_jenkins_builds_multibranch_after_enrich.csv | 16 ++
.../_tool_jenkins_stages_multibranch.csv | 130 ++++++-------
.../cicd_pipeline_commits_multibranch.csv | 26 +--
.../snapshot_tables/cicd_pipelines_multibranch.csv | 32 ++--
.../e2e/snapshot_tables/cicd_tasks_multibranch.csv | 71 +------
backend/plugins/jenkins/tasks/build_extractor.go | 2 +-
.../_tool_jira_issues_for_external_epics.csv | 8 +-
backend/plugins/jira/models/issue.go | 1 +
.../20240514_add_worklog_total_to_issue.go | 56 ++++++
.../jira/models/migrationscripts/register.go | 1 +
backend/plugins/jira/tasks/apiv2models/issue.go | 3 +
backend/plugins/jira/tasks/worklog_collector.go | 32 ++--
backend/plugins/sonarqube/api/remote_api.go | 7 +
backend/plugins/webhook/api/deployments.go | 141 +++++++-------
backend/server/api/middlewares.go | 1 +
config-ui/src/api/scope/index.ts | 6 +-
.../src/plugins/components/scope-config/index.tsx | 150 ++++++++++++---
.../register/webhook/components/create-dialog.tsx | 4 +-
.../register/webhook/components/view-dialog.tsx | 4 +-
.../routes/blueprint/connection-detail/index.tsx | 8 +-
.../routes/blueprint/connection-detail/table.tsx | 87 +++------
config-ui/src/routes/connection/connection.tsx | 68 +------
48 files changed, 1474 insertions(+), 568 deletions(-)
(incubator-devlake) 02/02: fix: jira dshelper
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch kw-5519-remoteapi-dshelper
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 614a6ce0cbb11917407085bb42bfa678011d6587
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Thu May 16 17:10:26 2024 +0800
fix: jira dshelper
---
backend/helpers/pluginhelper/api/ds_model_api_helper.go | 9 +++++++--
backend/helpers/srvhelper/typed_scope_service_helper.go | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/backend/helpers/pluginhelper/api/ds_model_api_helper.go b/backend/helpers/pluginhelper/api/ds_model_api_helper.go
index fa27f8d40..50134b3a2 100644
--- a/backend/helpers/pluginhelper/api/ds_model_api_helper.go
+++ b/backend/helpers/pluginhelper/api/ds_model_api_helper.go
@@ -202,14 +202,19 @@ func (modelApi *AnyModelApiHelper) PutMultipleCb(input *plugin.ApiResourceInput,
if err != nil {
return nil, err
}
- for i, item := range req.Data {
+ for i, itemDict := range req.Data {
+ item := modelApi.New()
+ err := utils.DecodeMapStruct(itemDict, item, false)
+ if err != nil {
+ return nil, err
+ }
if beforeSave != nil {
err := beforeSave(item)
if err != nil {
return nil, err
}
}
- err := modelApi.CreateOrUpdateAny(item)
+ err = modelApi.CreateOrUpdateAny(item)
if err != nil {
return nil, errors.BadInput.Wrap(err, fmt.Sprintf("failed to save item %d", i))
}
diff --git a/backend/helpers/srvhelper/typed_scope_service_helper.go b/backend/helpers/srvhelper/typed_scope_service_helper.go
index 1d44e2a50..2be57af1b 100644
--- a/backend/helpers/srvhelper/typed_scope_service_helper.go
+++ b/backend/helpers/srvhelper/typed_scope_service_helper.go
@@ -40,7 +40,7 @@ func (*GenericScopeModelInfo[S]) GetScopeConfigId(scope any) uint64 {
}
func (*GenericScopeModelInfo[S]) GetScopeParams(scope any) any {
- return scope.(plugin.ToolLayerScope).ScopeScopeConfigId()
+ return scope.(plugin.ToolLayerScope).ScopeParams()
}
func NewScopeModelInfo[S plugin.ToolLayerScope]() *GenericScopeModelInfo[S] {