Merge pull request #127 from dwasinge/hook-refresh

Filter Commits for Manual Refresh

Author: mcanoy

README.md

@@ -129,6 +129,7 @@ Deployment template will read from the above secret and inject following env var
 | Name | Example Value | Required |
 |------|---------------|----------|
 | COMMIT_FILTERED_EMAIL_LIST | [email protected],[email protected] | False |
+| COMMIT_FILTERED_MESSAGE_LIST | manual_refresh,another-message | False |
 
 ### Config Resource 
 

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

@@ -47,6 +47,9 @@ public class ProjectService {
     @ConfigProperty(name = "commit.page.size")
     int commitPageSize;
 
+    @ConfigProperty(name = "commit.msg.filter.list")
+    List<String> commitFilteredMessages;
+
     @ConfigProperty(name = "commit.filter.list")
     List<String> commitFilteredEmails;
 
@@ -182,7 +185,7 @@ public List<Commit> getCommitLog(String projectId) {
         LOGGER.debug("total commits for project {} {}", projectId, page.size());
 
         return page.getResults().stream().filter(e -> !commitFilteredEmails.contains(e.getAuthorEmail()))
-                .collect(Collectors.toList());
+                .filter(e -> !commitFilteredMessages.contains(e.getMessage())).collect(Collectors.toList());
 
     }
 

src/main/resources/application.properties

@@ -31,6 +31,7 @@ webhook.file=${WEBHOOK_FILE:/runtime/webhooks.yaml}
 webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
 config.gitlab.ref=${CONFIG_GITLAB_REF:master}
 commit.page.size=100
+commit.msg.filter.list=${COMMIT_FILTERED_MESSAGE_LIST:manual_refresh}
 commit.filter.list=${COMMIT_FILTERED_EMAIL_LIST:[email protected]}
 config.reload=${CONFIG_RELOAD:false}
 

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

@@ -346,6 +346,12 @@ public Response getCommitLog(String projectId, int perPage, int pageNumber) {
         if("multi/page/missingheader".equals(projectId)) {
             return Response.ok(commitList).build();
         }
+
+        if("multi/page/filtered".equals(projectId)) {
+            Commit c = Commit.builder().message("manual_refresh").build();
+            commitList.add(c);
+            return Response.ok(commitList).build();
+        }
 
         return Response.ok(new ArrayList<Commit>()).header("X-Total-Pages", 0).build();
     }

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

@@ -111,4 +111,11 @@ class ProjectServiceTest {
         assertNotNull(commits);
         assertEquals(3, commits.size());
     }
+
+    @Test void getCommitsMessageFilter() {
+        List<Commit> commits = projectService.getCommitLog("multi/page/filtered");
+        assertNotNull(commits);
+        assertEquals(3, commits.size());
+
+    }
 }