Merge pull request #146 from mcanoy/dry-run

mcanoy · web-flow · commit 33095605a1f8 · 2022-01-06T17:30:07.000-08:00
support migration dry run
diff --git a/src/main/java/com/redhat/labs/lodestar/resource/MigrationResource.java b/src/main/java/com/redhat/labs/lodestar/resource/MigrationResource.java
@@ -16,6 +16,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
+import java.util.Map;
 
 @Path("/api/migrate")
 @Tag(name = "Migration", description = "Migration services")
@@ -34,17 +35,18 @@ public Response migrate(@QueryParam(value = "participants") boolean migrateParti
             @QueryParam("hosting") boolean migrateHosting,
             @QueryParam("engagements") boolean migrateEngagements,
             @QueryParam("overwrite") boolean overwrite,
+            @QueryParam("dryRun") boolean dryRun,
             @QueryParam("uuids") List<String> uuids) {
 
         try {
-            migrationService.migrate(migrateUuids, migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements,
-                    overwrite, uuids);
+            LOGGER.debug("migration uuid {} participants {} artifacts {} hosting {} engagements {} overwrite {} dry run {} uuids {}",
+                    migrateUuids, migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements, overwrite, dryRun, uuids.size());
+            Map<String, String> failures = migrationService.migrate(migrateUuids, migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements,
+                    overwrite, dryRun, uuids);
+            return Response.ok(failures).build();
         } catch (Exception ex) {
             LOGGER.error("Migration did not complete successfully", ex);
             return Response.status(Response.Status.BAD_REQUEST).entity("{ \"message\": \"Migration did not complete successfully\"}").build();
         }
-        
-        return Response.ok().build();
-
     }
 }
diff --git a/src/main/java/com/redhat/labs/lodestar/service/EngagementService.java b/src/main/java/com/redhat/labs/lodestar/service/EngagementService.java
@@ -302,6 +302,8 @@ public Engagement getEngagement(String customerName, String engagementName, bool
 
         if (project.isPresent()) {
             engagement = getEngagement(project.get(), includeStatus, true).orElse(null);
+        } else {
+            LOGGER.warn("Could not find project for {} {}", customerName, engagementName);
         }
 
         return engagement;
@@ -312,6 +314,7 @@ public Optional<Engagement> getEngagement(Project project, boolean includeStatus
 
         Optional<File> engagementFile = fileService.getFileAllow404(project.getId(), ENGAGEMENT_FILE);
         if (engagementFile.isPresent()) {
+            LOGGER.debug("Translating json from project {}", project.getId());
             engagement = json.fromJson(engagementFile.get().getContent(), Engagement.class);
 
             if (includeCommits) {
diff --git a/src/main/java/com/redhat/labs/lodestar/service/FileService.java b/src/main/java/com/redhat/labs/lodestar/service/FileService.java
@@ -137,6 +137,7 @@ public Optional<File> getFile(String projectIdOrPath, String filePath, String re
         try {
 
             // get file
+            LOGGER.debug("File ({})-> {}", projectIdOrPath, filePath);
             File file = gitLabService.getFile(projectIdOrPath, filePath, ref);
 
             if (null != file) {
@@ -150,6 +151,8 @@ public Optional<File> getFile(String projectIdOrPath, String filePath, String re
                 LOGGER.error("Get file {} for project {} failed with code {}", filePath, projectIdOrPath, wae.getResponse().getStatus());
                 throw wae;
             }
+        } catch(Exception ex) {
+            LOGGER.error(String.format("Get file %s for project %s failed", filePath, projectIdOrPath), ex);
         }
 
         return optional;
diff --git a/src/main/java/com/redhat/labs/lodestar/service/MigrationService.java b/src/main/java/com/redhat/labs/lodestar/service/MigrationService.java
@@ -60,8 +60,8 @@ public class MigrationService {
      * The migration is idempotent so no harm in rerunning. It will only update
      * engagements that haven't been migrated. 
      */
-    public void migrate(boolean migrateUuids, boolean migrateParticipants, boolean migrateArtifacts, boolean migrateHosting,
-                        boolean migrateEngagements, boolean overwrite, List<String> uuids) {
+    public Map<String, String> migrate(boolean migrateUuids, boolean migrateParticipants, boolean migrateArtifacts, boolean migrateHosting,
+                        boolean migrateEngagements, boolean overwrite, boolean dryRun, List<String> uuids) {
         LOGGER.debug("uuids {} participants {} artifacts {} hosting {} engagements {} overwrite {} uuid {}", migrateUuids,
                 migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements, overwrite, uuids.size());
 
@@ -78,13 +78,14 @@ public void migrate(boolean migrateUuids, boolean migrateParticipants, boolean m
         }
 
         LOGGER.info("Start Migrate content");
-        migrateAll(migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements, overwrite, uuids);
+        Map<String, String> failures = migrateAll(migrateParticipants, migrateArtifacts, migrateHosting, migrateEngagements, overwrite, dryRun, uuids);
         LOGGER.info("End Migrate content");
-
+        return failures;
     }
 
-    private void migrateAll(boolean migrateParticipants, boolean migrateArtifacts, boolean migrateHosting,
-                            boolean migrateEngagements, boolean overwrite, List<String> uuids ) {
+    private Map<String, String> migrateAll(boolean migrateParticipants, boolean migrateArtifacts, boolean migrateHosting,
+                            boolean migrateEngagements, boolean overwrite, boolean dryRun, List<String> uuids ) {
+        Map<String, String> failures = new HashMap<>();
         int counter = 0;
         LOGGER.debug("Migration engagement count {}", getAllEngagements().size());
         for(Engagement e : getAllEngagements().values()) {
@@ -123,10 +124,23 @@ private void migrateAll(boolean migrateParticipants, boolean migrateArtifacts, b
                     CommitMultiple commit = CommitMultiple.builder().id(e.getProjectId()).branch(commitBranch).commitMessage(commitMessage).actions(actions)
                             .authorName(commitAuthor).authorEmail(commitEmail).build();
 
-                    fileService.createFiles(e.getProjectId(), commit);
+                    if(dryRun) {
+                        LOGGER.info("Will not migrate due to dry run {}", e.getUuid());
+                    } else {
+                        LOGGER.info("Migrating create or update {}", e.getUuid());
+                        try {
+                            fileService.createFiles(e.getProjectId(), commit);
+                            LOGGER.info("Migration complete for {}", e.getUuid());
+                        } catch(Exception ex) {
+                            LOGGER.error(String.format("Error migrating %s", e.getUuid()), ex);
+                            failures.put(e.getUuid(), ex.getMessage());
+                        }
+                    }
                 }
             }
         }
+
+        return failures;
     }
 
     /**
diff --git a/src/test/java/com/redhat/labs/lodestar/service/MigrationServiceTest.java b/src/test/java/com/redhat/labs/lodestar/service/MigrationServiceTest.java
@@ -92,12 +92,12 @@ public static void setup() {
     @Test 
     void migrate() {
         migrationService.migrate(false, false, false, false, false,
-                false, Collections.emptyList());
+                false, false, Collections.emptyList());
         
         Mockito.verify(projectServiceMock, Mockito.never()).updateProject(Mockito.any());
         Mockito.verify(fileServiceMock, Mockito.never()).createFile(Mockito.anyInt(), Mockito.eq("engagement/participants.json"), Mockito.any(File.class));
 
-        migrationService.migrate(true, true, true, true, true, false, Collections.emptyList());
+        migrationService.migrate(true, true, true, true, true, false, false, Collections.emptyList());
 
         Mockito.verify(projectServiceMock, Mockito.times(2)).updateProject(Mockito.any());
         Mockito.verify(fileServiceMock, Mockito.times(3)).createFiles(Mockito.anyInt(), Mockito.any(CommitMultiple.class));

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ public Optional<File> getFile(String projectIdOrPath, String filePath, String re`
`137`	`137`	`try {`
`138`	`138`
`139`	`139`	`// get file`
	`140`	`+ LOGGER.debug("File ({})-> {}", projectIdOrPath, filePath);`
`140`	`141`	`File file = gitLabService.getFile(projectIdOrPath, filePath, ref);`
`141`	`142`
`142`	`143`	`if (null != file) {`
`@@ -150,6 +151,8 @@ public Optional<File> getFile(String projectIdOrPath, String filePath, String re`
`150`	`151`	`LOGGER.error("Get file {} for project {} failed with code {}", filePath, projectIdOrPath, wae.getResponse().getStatus());`
`151`	`152`	`throw wae;`
`152`	`153`	`}`
	`154`	`+ } catch(Exception ex) {`
	`155`	`+ LOGGER.error(String.format("Get file %s for project %s failed", filePath, projectIdOrPath), ex);`
`153`	`156`	`}`
`154`	`157`
`155`	`158`	`return optional;`