From a59aaebc7e2fb6b1d14d6637cad7522463c0b25f Mon Sep 17 00:00:00 2001 From: Josh Bialkowski Date: Wed, 4 Dec 2019 22:50:35 -0800 Subject: codreview #3: two credential types, more fixes * Support both token and session credential types * use getTimeDervedID in export.go * keyOrigin -> core.KeyOrigin * fix one indentation * remove project key from operation metadata * fix missing credentials codepath if not using sidecar --- bridge/jira/export.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bridge/jira/export.go') diff --git a/bridge/jira/export.go b/bridge/jira/export.go index 8d8d326d..02ec5e14 100644 --- a/bridge/jira/export.go +++ b/bridge/jira/export.go @@ -171,7 +171,7 @@ func (self *jiraExporter) exportBug( author := snapshot.Author // skip bug if it was imported from some other bug system - origin, ok := snapshot.GetCreateMetadata(keyOrigin) + origin, ok := snapshot.GetCreateMetadata(core.KeyOrigin) if ok && origin != target { out <- core.NewExportNothing( b.Id(), fmt.Sprintf("issue tagged with origin: %s", origin)) @@ -342,7 +342,7 @@ func (self *jiraExporter) exportBug( // so we use the comment ID plus the timestamp of the update, as // reported by JIRA. Note that this must be consistent with the importer // during ensureComment() - id = fmt.Sprintf("%s-%d", comment.ID, comment.Updated.Unix()) + id = getTimeDerivedID(comment.ID, comment.Updated) } case *bug.SetStatusOperation: -- cgit