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/03/08 02:49:00 UTC
(incubator-devlake) branch release-v0.21 updated: fix(customize): issue_repo_commit.host column ignores port, consistant with devinsights change. (#7094) (#7140)
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch release-v0.21
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.21 by this push:
new c3aff885d fix(customize): issue_repo_commit.host column ignores port, consistant with devinsights change. (#7094) (#7140)
c3aff885d is described below
commit c3aff885d945c214c5c791f07ad0539b383e2a6b
Author: Leric Zhang <li...@merico.dev>
AuthorDate: Fri Mar 8 10:48:56 2024 +0800
fix(customize): issue_repo_commit.host column ignores port, consistant with devinsights change. (#7094) (#7140)
---
backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go | 2 +-
backend/plugins/tapd/tasks/bug_commit_converter.go | 2 +-
backend/plugins/tapd/tasks/story_commit_converter.go | 2 +-
backend/plugins/tapd/tasks/task_commit_converter.go | 2 +-
backend/plugins/zentao/tasks/shared.go | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go b/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go
index d5d6e2763..3ed842ee5 100644
--- a/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go
+++ b/backend/helpers/pluginhelper/api/issue_repo_commit_convertor.go
@@ -43,7 +43,7 @@ func RefineIssueRepoCommit(item *crossdomain.IssueRepoCommit, repoPatterns []*re
if err != nil {
return item
}
- item.Host = u.Host
+ item.Host = u.Hostname()
for _, pattern := range repoPatterns {
if pattern.MatchString(commitUrl) {
group := pattern.FindStringSubmatch(commitUrl)
diff --git a/backend/plugins/tapd/tasks/bug_commit_converter.go b/backend/plugins/tapd/tasks/bug_commit_converter.go
index f90c6818f..f47dc4c8e 100644
--- a/backend/plugins/tapd/tasks/bug_commit_converter.go
+++ b/backend/plugins/tapd/tasks/bug_commit_converter.go
@@ -71,7 +71,7 @@ func ConvertBugCommit(taskCtx plugin.SubTaskContext) errors.Error {
IssueId: issueIdGen.Generate(data.Options.ConnectionId, toolL.BugId),
RepoUrl: repoUrl,
CommitSha: toolL.CommitId,
- Host: u.Host,
+ Host: u.Hostname(),
Namespace: getRepoNamespaceFromUrlPath(u.Path),
RepoName: getRepoNameFromUrlPath(u.Path),
}
diff --git a/backend/plugins/tapd/tasks/story_commit_converter.go b/backend/plugins/tapd/tasks/story_commit_converter.go
index 071db0334..b98ddbc12 100644
--- a/backend/plugins/tapd/tasks/story_commit_converter.go
+++ b/backend/plugins/tapd/tasks/story_commit_converter.go
@@ -69,7 +69,7 @@ func ConvertStoryCommit(taskCtx plugin.SubTaskContext) errors.Error {
IssueId: issueIdGen.Generate(data.Options.ConnectionId, toolL.StoryId),
RepoUrl: repoUrl,
CommitSha: toolL.CommitId,
- Host: u.Host,
+ Host: u.Hostname(),
Namespace: getRepoNamespaceFromUrlPath(u.Path),
RepoName: getRepoNameFromUrlPath(u.Path),
}
diff --git a/backend/plugins/tapd/tasks/task_commit_converter.go b/backend/plugins/tapd/tasks/task_commit_converter.go
index c4c48e84f..aec034839 100644
--- a/backend/plugins/tapd/tasks/task_commit_converter.go
+++ b/backend/plugins/tapd/tasks/task_commit_converter.go
@@ -72,7 +72,7 @@ func ConvertTaskCommit(taskCtx plugin.SubTaskContext) errors.Error {
IssueId: issueIdGen.Generate(data.Options.ConnectionId, toolL.TaskId),
RepoUrl: repoUrl,
CommitSha: toolL.CommitId,
- Host: u.Host,
+ Host: u.Hostname(),
Namespace: getRepoNamespaceFromUrlPath(u.Path),
RepoName: getRepoNameFromUrlPath(u.Path),
}
diff --git a/backend/plugins/zentao/tasks/shared.go b/backend/plugins/zentao/tasks/shared.go
index cd78d45e5..aa1140573 100644
--- a/backend/plugins/zentao/tasks/shared.go
+++ b/backend/plugins/zentao/tasks/shared.go
@@ -154,7 +154,7 @@ func parseRepoUrl(repoUrl string) (string, string, string, error) {
return "", "", "", err
}
- host := parsedUrl.Host
+ host := parsedUrl.Hostname()
host = strings.TrimPrefix(host, "www.")
pathParts := strings.Split(parsedUrl.Path, "/")
if len(pathParts) < 3 {