Merge pull request #110 from dwasinge/clear-webhooks

Clear Webhooks on Reload

Author: mcanoy

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

@@ -47,6 +47,9 @@ public class ConfigService {
     @ConfigProperty(name = "config.gitlab.ref", defaultValue = "master")
     String gitRef;
 
+    @ConfigProperty(name = "config.reload")
+    boolean reloadConfig;
+
     ConfigMap hookConfigMap;
     ConfigMap configurationConfigMap;
 
@@ -74,8 +77,10 @@ public class ConfigService {
      */
     @Scheduled(every = "30s")
     void reloadConfigMapData() {
-        loadWebHookData();
-        loadConfigurationData();
+        if(reloadConfig) {
+            loadWebHookData();
+            loadConfigurationData();
+        }
     }
 
     /**
@@ -87,17 +92,16 @@ void loadWebHookData() {
         // create config map
         if (null == hookConfigMap) {
             hookConfigMap = ConfigMap.builder().filePath(webHooksFile).build();
-            LOGGER.trace("setting webhook config map: {}", hookConfigMap);
+            LOGGER.debug("setting webhook config map: {}", hookConfigMap);
         }
 
         // load content from file
         if (hookConfigMap.updateMountedFile()) {
-            LOGGER.trace("loading latest version of webhook file");
 
             // set hook config as list
             if (hookConfigMap.getContent().isPresent()) {
                 hookConfigList = marshaller.fromYaml(hookConfigMap.getContent().get(), HookConfig.class);
-                LOGGER.debug("Hook Config List {}", hookConfigList);
+                LOGGER.debug("Loaded Hook Config List {}", hookConfigList);
             }
 
             // update web hooks
@@ -119,14 +123,20 @@ void updateWebHooksInGitLab() {
         projects.stream().filter(project -> project.getName().equals(IAC))
                 .filter(project -> !engagementIsArchived(project)).forEach(project -> {
 
+                    Integer projectId = project.getId();
+
                     LOGGER.debug("updating project: {}",
-                            (null != project.getNamespace()) ? project.getNamespace().getFullPath() : project.getId());
+                            (null != project.getNamespace()) ? project.getNamespace().getFullPath() : projectId);
+
+                    // remove existing webhooks for project
+                    hookService.deleteProjectHooks(projectId);
 
+                    // create hooks from configuration
                     hookConfigs.stream().forEach(hookC -> {
-                        Hook hook = Hook.builder().projectId(project.getId()).pushEvents(true).url(hookC.getBaseUrl())
+                        Hook hook = Hook.builder().projectId(projectId).pushEvents(true).url(hookC.getBaseUrl())
                                 .token(hookC.getToken()).build();
-                        LOGGER.debug("\tupdating webhook {}", hook.getUrl());
-                        Response response = hookService.createOrUpdateProjectHook(project.getId(), hook);
+                        LOGGER.debug("\tcreating webhook {}", hook.getUrl());
+                        Response response = hookService.createProjectHook(projectId, hook);
                         LOGGER.debug("\t\tservice response code: {}", response.getStatus());
                         response.close();
 

src/main/resources/application.properties

@@ -32,6 +32,7 @@ webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
 config.gitlab.ref=${CONFIG_GITLAB_REF:master}
 commit.page.size=100
 commit.filter.list=${COMMIT_FILTERED_EMAIL_LIST:[email protected]}
+config.reload=${CONFIG_RELOAD:false}
 
 # engagements
 engagements.repository.id=${ENGAGEMENTS_REPOSITORY_ID:2}

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

@@ -33,6 +33,7 @@ class ConfigServiceTest {
         service.projectService = projectService;        
         service.engagementRepositoryId = 0;
 
+        service.reloadConfig = true;
         service.reloadConfigMapData();
         File config = service.getConfigFile();
 
@@ -94,6 +95,7 @@ class ConfigServiceTest {
         service.projectService = projectService;        
         service.engagementRepositoryId = 0;
 
+        service.reloadConfig = true;
         service.reloadConfigMapData();
         List<HookConfig> hookConfigList = service.getHookConfig();