Merge pull request #53 from sacha-c/fix-closing-gitlab-issue

fix: close gitlab issue with iid

Author: sacha-c

internal/publish/to_slack.go

@@ -204,6 +204,10 @@ func formatReportMessage(reportsBySeverityKind map[scanner.SeverityScoreKind][]s
 	}
 
 	textString := text.String()
+	if len(textString) == 0 {
+		return
+	}
+
 	// Slack has a 3001 character limit for messages
 	splitText := splitMessage(textString, 3000)
 

internal/repository/gitlab/gitlab.go

@@ -60,7 +60,7 @@ func (s gitlabService) CloseVulnerabilityIssue(project repository.Project) (err
 		return
 	}
 
-	issue, _, err = s.client.UpdateIssue(project.ID, issue.ID, &gitlab.UpdateIssueOptions{
+	issue, _, err = s.client.UpdateIssue(project.ID, issue.IID, &gitlab.UpdateIssueOptions{
 		StateEvent: gitlab.Ptr("close"),
 	})
 	if err != nil {

internal/repository/gitlab/gitlab_test.go

@@ -119,12 +119,12 @@ func TestGetProjectListWithNextPage(t *testing.T) {
 
 func TestCloseVulnerabilityIssue(t *testing.T) {
 	mockClient := mockClient{}
-	mockClient.On("ListProjectIssues", mock.Anything, mock.Anything, mock.Anything).Return([]*gitlab.Issue{{State: "opened"}}, nil, nil)
-	mockClient.On("UpdateIssue", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&gitlab.Issue{State: "closed"}, nil, nil)
+	mockClient.On("ListProjectIssues", mock.Anything, mock.Anything, mock.Anything).Return([]*gitlab.Issue{{IID: 2, State: "opened"}}, nil, nil)
+	mockClient.On("UpdateIssue", 1, 2, mock.Anything, mock.Anything).Return(&gitlab.Issue{State: "closed"}, nil, nil)
 
 	svc := gitlabService{client: &mockClient}
 
-	err := svc.CloseVulnerabilityIssue(repository.Project{})
+	err := svc.CloseVulnerabilityIssue(repository.Project{ID: 1})
 
 	assert.Nil(t, err)
 	mockClient.AssertExpectations(t)