Merge pull request #123 from dwasinge/rest-retry

GitLab Rest Client Retry

Author: mcanoy

pom.xml

@@ -55,6 +55,11 @@
 			<groupId>io.quarkus</groupId>
 			<artifactId>quarkus-rest-client</artifactId>
 		</dependency>
+		<!-- Fault Tolerance -->
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
+		</dependency>
 		<!-- Templates -->
 		<dependency>
 			<groupId>io.quarkus</groupId>

src/main/java/com/redhat/labs/lodestar/rest/client/GitLabService.java

@@ -14,6 +14,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 
+import org.eclipse.microprofile.faulttolerance.Retry;
 import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@@ -29,6 +30,7 @@
 import com.redhat.labs.lodestar.models.gitlab.ProjectTransfer;
 import com.redhat.labs.lodestar.resources.filter.Logged;
 
+@Retry(maxRetries = 5, delay = 2000)
 @Path("/api/v4")
 @RegisterRestClient(configKey = "gitlab.api")
 @RegisterProvider(value = GitLabServiceResponseMapper.class, priority = 50)

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

@@ -121,32 +121,30 @@ void updateWebHooksInGitLab() {
         List<HookConfig> hookConfigs = getHookConfig();
         List<Project> projects = projectService.getProjectsByGroup(engagementRepositoryId, true);
         LOGGER.debug("number of projects found: {}", projects.size());
-        projects.stream().filter(project -> project.getName().equals(IAC))
-                .forEach(project -> {
+        projects.stream().filter(project -> project.getName().equals(IAC)).forEach(project -> {
 
-                    Integer projectId = project.getId();
+            Integer projectId = project.getId();
 
-                    LOGGER.debug("updating project: {}",
-                            (null != project.getNamespace()) ? project.getNamespace().getFullPath() : projectId);
+            LOGGER.debug("updating project: {}",
+                    (null != project.getNamespace()) ? project.getNamespace().getFullPath() : projectId);
 
-                    // remove existing webhooks for project
-                    hookService.deleteProjectHooks(projectId);
-                    
-                    boolean isArchived = isEngagementArchived(project);
+            // remove existing webhooks for project
+            hookService.deleteProjectHooks(projectId);
 
-                    // create hooks from configuration
-                    hookConfigs.stream().filter(config -> config.isEnabledAfterArchive() || !isArchived)
-                        .forEach(hookC -> {
-                        Hook hook = Hook.builder().projectId(projectId).pushEvents(true).url(hookC.getBaseUrl())
-                                .token(hookC.getToken()).build();
-                        LOGGER.debug("\tcreating webhook {}", hook.getUrl());
-                        Response response = hookService.createProjectHook(projectId, hook);
-                        LOGGER.debug("\t\tservice response code: {}", response.getStatus());
-                        response.close();
+            boolean isArchived = isEngagementArchived(project);
 
-                    });
+            // create hooks from configuration
+            hookConfigs.stream().filter(config -> config.isEnabledAfterArchive() || !isArchived).forEach(hookC -> {
+                Hook hook = Hook.builder().projectId(projectId).pushEvents(true).url(hookC.getBaseUrl())
+                        .token(hookC.getToken()).build();
+                LOGGER.debug("\tcreating webhook {}", hook.getUrl());
+                Response response = hookService.createProjectHook(projectId, hook);
+                LOGGER.debug("\t\tservice response code: {}", response.getStatus());
+                response.close();
 
-                });
+            });
+
+        });
 
     }
 
@@ -193,11 +191,15 @@ boolean isEngagementArchived(Project project) {
      */
     public void createWebhooksForEnagement(Engagement engagement) {
 
+        LOGGER.debug("creating webhooks for engagement {}:{}:{}", engagement.getCustomerName(),
+                engagement.getProjectName(), engagement.getProjectId());
         List<HookConfig> hookConfigs = getHookConfig();
+        LOGGER.debug("\tconfigured hooks {}", hookConfigs);
         hookConfigs.stream().forEach(hookC -> {
             Hook hook = Hook.builder().projectId(engagement.getProjectId()).pushEvents(true).url(hookC.getBaseUrl())
                     .token(hookC.getToken()).build();
-                hookService.createProjectHook(engagement.getProjectId(), hook);
+            LOGGER.debug("\t\tadding webhook {} to project {}", hook.getUrl(), engagement.getProjectId());
+            hookService.createProjectHook(engagement.getProjectId(), hook);
         });
 
     }
@@ -217,8 +219,7 @@ void loadConfigurationData() {
         // create file
         Optional<String> content = configurationConfigMap.getContent();
         if (content.isPresent()) {
-            configuration = File.builder().filePath(configFile).content(content.get())
-                    .build();
+            configuration = File.builder().filePath(configFile).content(content.get()).build();
         }
 
     }

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

@@ -162,6 +162,7 @@ Group processNameChange(String newName, Integer parentId, Optional<Group> group,
                             .build();
 
                     // udpate group in Git
+                    LOGGER.debug("updating name and path of existing group to {}", modified);
                     return groupService.updateGitLabGroup(existingGroup.getId(), modified).orElseThrow(
                             () -> new WebApplicationException("failed to update group name/path for " + group, 500));
 
@@ -177,7 +178,7 @@ Group processNameChange(String newName, Integer parentId, Optional<Group> group,
     }
 
     Group createGroup(String name, Integer parentId) {
-
+        LOGGER.debug("creating new group {} for parent {}", name, parentId);
         return groupService
                 .createGitLabGroup(Group.builder().name(name).path(GitLabPathUtils.generateValidPath(name))
                         .parentId(parentId).build())
@@ -198,6 +199,7 @@ Optional<Project> createOrUpdateProject(Optional<Project> project, Optional<Inte
             Integer parentId) {
 
         if (project.isEmpty()) {
+            LOGGER.debug("creating new project for parent id {}", parentId);
             return createProject(parentId);
         }
 
@@ -214,12 +216,13 @@ Optional<Project> createOrUpdateProject(Optional<Project> project, Optional<Inte
         toMove.setMovedOrDeleted(true);
 
         // move project to new parent/group id
+        LOGGER.debug("moving project {} to group id {}", toMove.getNamespace(), newParentId);
         return projectService.transferProject(projectId, newParentId);
 
     }
 
     Optional<Project> createProject(Integer parentId) {
-
+        LOGGER.debug("debug creating project for parent id {}", parentId);
         return projectService.createProject(
                 Project.builder().name(ENGAGEMENT_PROJECT_NAME).visibility("private").namespaceId(parentId).build());
 

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

@@ -10,7 +10,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.ws.rs.WebApplicationException;