Skip to content

Commit fad70c1

Browse files
committed
commit message filtering configurable
1 parent 14f7411 commit fad70c1

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

src/main/java/com/redhat/labs/lodestar/service/ProjectService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public class ProjectService {
4747
@ConfigProperty(name = "commit.page.size")
4848
int commitPageSize;
4949

50+
@ConfigProperty(name = "commit.msg.filter.list")
51+
List<String> commitFilteredMessages;
52+
5053
@ConfigProperty(name = "commit.filter.list")
5154
List<String> commitFilteredEmails;
5255

@@ -182,7 +185,7 @@ public List<Commit> getCommitLog(String projectId) {
182185
LOGGER.debug("total commits for project {} {}", projectId, page.size());
183186

184187
return page.getResults().stream().filter(e -> !commitFilteredEmails.contains(e.getAuthorEmail()))
185-
.filter(e -> !"manual_refresh".equals(e.getMessage())).collect(Collectors.toList());
188+
.filter(e -> !commitFilteredMessages.contains(e.getMessage())).collect(Collectors.toList());
186189

187190
}
188191

src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ webhook.file=${WEBHOOK_FILE:/runtime/webhooks.yaml}
3131
webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
3232
config.gitlab.ref=${CONFIG_GITLAB_REF:master}
3333
commit.page.size=100
34+
commit.msg.filter.list=${COMMIT_FILTERED_MESSAGE_LIST:manual_refresh}
3435
commit.filter.list=${COMMIT_FILTERED_EMAIL_LIST:[email protected]}
3536
config.reload=${CONFIG_RELOAD:false}
3637

src/test/java/com/redhat/labs/lodestar/mocks/MockGitLabService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,12 @@ public Response getCommitLog(String projectId, int perPage, int pageNumber) {
346346
if("multi/page/missingheader".equals(projectId)) {
347347
return Response.ok(commitList).build();
348348
}
349+
350+
if("multi/page/filtered".equals(projectId)) {
351+
Commit c = Commit.builder().message("manual_refresh").build();
352+
commitList.add(c);
353+
return Response.ok(commitList).build();
354+
}
349355

350356
return Response.ok(new ArrayList<Commit>()).header("X-Total-Pages", 0).build();
351357
}

src/test/java/com/redhat/labs/lodestar/service/ProjectServiceTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,11 @@ class ProjectServiceTest {
111111
assertNotNull(commits);
112112
assertEquals(3, commits.size());
113113
}
114+
115+
@Test void getCommitsMessageFilter() {
116+
List<Commit> commits = projectService.getCommitLog("multi/page/filtered");
117+
assertNotNull(commits);
118+
assertEquals(3, commits.size());
119+
120+
}
114121
}

0 commit comments

Comments
 (0)