jira: tag bugs with the base URL, tighten the matching

Michael Muré created 5 years ago

Change summary

bridge/jira/import.go | 12 +++++++++++-
bridge/jira/jira.go   |  1 +
2 files changed, 12 insertions(+), 1 deletion(-)

Detailed changes

bridge/jira/import.go

@@ -216,7 +216,16 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
 		return nil, err
 	}
 
-	b, err := repo.ResolveBugCreateMetadata(metaKeyJiraId, issue.ID)
+	b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
+		if _, ok := excerpt.CreateMetadata[metaKeyJiraBaseUrl]; ok &&
+			excerpt.CreateMetadata[metaKeyJiraBaseUrl] != ji.conf[confKeyBaseUrl] {
+			return false
+		}
+
+		return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
+			excerpt.CreateMetadata[metaKeyJiraId] == issue.ID &&
+			excerpt.CreateMetadata[metaKeyJiraProject] == ji.conf[confKeyProject]
+	})
 	if err != nil && err != bug.ErrBugNotExist {
 		return nil, err
 	}
@@ -241,6 +250,7 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
 				metaKeyJiraId:      issue.ID,
 				metaKeyJiraKey:     issue.Key,
 				metaKeyJiraProject: ji.conf[confKeyProject],
+				metaKeyJiraBaseUrl: ji.conf[confKeyBaseUrl],
 			})
 		if err != nil {
 			return nil, err

bridge/jira/jira.go

@@ -20,6 +20,7 @@ const (
 	metaKeyJiraKey        = "jira-key"
 	metaKeyJiraUser       = "jira-user"
 	metaKeyJiraProject    = "jira-project"
+	metaKeyJiraBaseUrl    = "jira-base-url"
 	metaKeyJiraExportTime = "jira-export-time"
 	metaKeyJiraLogin      = "jira-login"