Skip to content

On branch limit analysis to new issues since last leak period #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 18, 2021
Merged

On branch limit analysis to new issues since last leak period #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6649ffd
On branch limit analysis to new issues since last leak period
stalb May 22, 2021
7b92bea
Ignore `sonar.gitlab.merge_request_discussion` in branch analyses
stalb May 23, 2021
5cea775
test update
stalb May 23, 2021
cc8938d
Merge branch 'feature/merge_request_discussion'
stalb May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV4Wrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public String getGitLabUrl(@Nullable String revision, String path, @Nullable Int
@Override
public void createOrUpdateReviewComment(String revision, String fullPath, Integer line, String body) {
try {
if (config.isMergeRequestDiscussionEnabled()) {
if (config.isMergeRequestDiscussionEnabled() && config.mergeRequestIid() != -1) {
createReviewDiscussion(fullPath, line, body);
} else {
gitLabAPIV4.getGitLabAPICommits().postCommitComments(gitLabProject.getId(), revision != null ? revision : getFirstCommitSHA(), body, fullPath, line, "new");
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/talanlabs/sonar/plugins/gitlab/SonarFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ private Issues.SearchWsResponse searchIssues(String componentKey, int pullReques
}
else if (isNotBlankAndNotEmpty(branch)) {
searchRequest.setBranch(branch);
if (! gitLabPluginConfiguration.allIssues()) {
searchRequest.setSinceLeakPeriod("true");
}
}
return wsClient.issues().search(searchRequest);
}
Expand Down
22 changes: 19 additions & 3 deletions src/test/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV4WrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,35 @@ public void testReviewComment() throws IOException {
}

@Test
public void testCreateReviewDiscussionMissingIidFail() {
public void testCreateReviewDiscussionMissingIidFallbackCommentOnCommit() throws IOException {
GitLabPluginConfiguration gitLabPluginConfiguration = mock(GitLabPluginConfiguration.class);
when(gitLabPluginConfiguration.commitSHA()).thenReturn(Collections.singletonList("1"));
when(gitLabPluginConfiguration.refName()).thenReturn("master");
when(gitLabPluginConfiguration.mergeRequestIid()).thenReturn(-1);
when(gitLabPluginConfiguration.isMergeRequestDiscussionEnabled()).thenReturn(true);

GitLabApiV4Wrapper facade = new GitLabApiV4Wrapper(gitLabPluginConfiguration);

GitLabAPI gitLabAPI = mock(GitLabAPI.class);
facade.setGitLabAPI(gitLabAPI);

GitLabAPICommits gitLabAPICommits = mock(GitLabAPICommits.class);
when(gitLabAPICommits.postCommitComments("1", "1", "pending", "master", null, null)).thenReturn(null);

when(gitLabAPI.getGitLabAPICommits()).thenReturn(gitLabAPICommits);

GitLabProject gitLabProject = mock(GitLabProject.class);
when(gitLabProject.getId()).thenReturn(1);
facade.setGitLabProject(gitLabProject);

assertThatIllegalArgumentException().isThrownBy(() ->
facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing"));
facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing");

verify(gitLabAPICommits).postCommitComments(1, "1", "nothing", "src/main/Foo.java", 5, "new");



//assertThatIllegalArgumentException().isThrownBy(() ->
// facade.createOrUpdateReviewComment(null, "src/main/Foo.java", 5, "nothing"));
}

@Test
Expand Down