diff --git a/pkg/notify/notify.go b/pkg/notify/notify.go index 46cb5b7..2284b26 100644 --- a/pkg/notify/notify.go +++ b/pkg/notify/notify.go @@ -35,7 +35,7 @@ import ( // TODO(bwplotka): Consider renaming this package to ticketer. type jiraIssueService interface { - Search(jql string, options *jira.SearchOptions) ([]jira.Issue, *jira.Response, error) + SearchV2JQL(jql string, options *jira.SearchOptionsV2) ([]jira.Issue, *jira.Response, error) GetTransitions(id string) ([]jira.Transition, *jira.Response, error) Create(issue *jira.Issue) (*jira.Issue, *jira.Response, error) @@ -330,13 +330,13 @@ func (r *Receiver) search(projects []string, issueLabel string) (*jira.Issue, bo // Search multiple projects in case issue was moved and further alert firings are desired in existing JIRA. projectList := "'" + strings.Join(projects, "', '") + "'" query := fmt.Sprintf("project in(%s) and labels=%q order by resolutiondate desc", projectList, issueLabel) - options := &jira.SearchOptions{ + options := &jira.SearchOptionsV2{ Fields: []string{"summary", "priority", "status", "resolution", "resolutiondate", "description", "comment"}, MaxResults: 2, } level.Debug(r.logger).Log("msg", "search", "query", query, "options", fmt.Sprintf("%+v", options)) - issues, resp, err := r.client.Search(query, options) + issues, resp, err := r.client.SearchV2JQL(query, options) if err != nil { retry, err := handleJiraErrResponse("Issue.Search", resp, err, r.logger) return nil, retry, err diff --git a/pkg/notify/notify_test.go b/pkg/notify/notify_test.go index 7aee66a..8f52127 100644 --- a/pkg/notify/notify_test.go +++ b/pkg/notify/notify_test.go @@ -52,7 +52,7 @@ func newTestFakeJira() *fakeJira { } } -func (f *fakeJira) Search(jql string, options *jira.SearchOptions) ([]jira.Issue, *jira.Response, error) { +func (f *fakeJira) SearchV2JQL(jql string, options *jira.SearchOptionsV2) ([]jira.Issue, *jira.Response, error) { var issues []jira.Issue for _, key := range f.keysByQuery[jql] { issue := jira.Issue{Key: key, Fields: &jira.IssueFields{}}