Skip to content

Commit a13f7fd

Browse files
committed
fix: close gitlab issue with iid
1 parent a9d451a commit a13f7fd

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

internal/publish/to_slack.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@ func formatReportMessage(reportsBySeverityKind map[scanner.SeverityScoreKind][]s
204204
}
205205

206206
textString := text.String()
207+
if len(textString) == 0 {
208+
return
209+
}
210+
207211
// Slack has a 3001 character limit for messages
208212
splitText := splitMessage(textString, 3000)
209213

internal/repository/gitlab/gitlab.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (s gitlabService) CloseVulnerabilityIssue(project repository.Project) (err
6060
return
6161
}
6262

63-
issue, _, err = s.client.UpdateIssue(project.ID, issue.ID, &gitlab.UpdateIssueOptions{
63+
issue, _, err = s.client.UpdateIssue(project.ID, issue.IID, &gitlab.UpdateIssueOptions{
6464
StateEvent: gitlab.Ptr("close"),
6565
})
6666
if err != nil {

internal/repository/gitlab/gitlab_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ func TestGetProjectListWithNextPage(t *testing.T) {
119119

120120
func TestCloseVulnerabilityIssue(t *testing.T) {
121121
mockClient := mockClient{}
122-
mockClient.On("ListProjectIssues", mock.Anything, mock.Anything, mock.Anything).Return([]*gitlab.Issue{{State: "opened"}}, nil, nil)
123-
mockClient.On("UpdateIssue", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&gitlab.Issue{State: "closed"}, nil, nil)
122+
mockClient.On("ListProjectIssues", mock.Anything, mock.Anything, mock.Anything).Return([]*gitlab.Issue{{IID: 2, State: "opened"}}, nil, nil)
123+
mockClient.On("UpdateIssue", 1, 2, mock.Anything, mock.Anything).Return(&gitlab.Issue{State: "closed"}, nil, nil)
124124

125125
svc := gitlabService{client: &mockClient}
126126

127-
err := svc.CloseVulnerabilityIssue(repository.Project{})
127+
err := svc.CloseVulnerabilityIssue(repository.Project{ID: 1})
128128

129129
assert.Nil(t, err)
130130
mockClient.AssertExpectations(t)

0 commit comments

Comments
 (0)