More logging

Author: marcingrzejszczak

src/main/java/io/micrometer/release/train/DependencyVerifier.java

@@ -15,6 +15,8 @@
  */
 package io.micrometer.release.train;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.release.common.Dependency;
 import io.micrometer.release.common.GradleParser;
 import io.micrometer.release.common.Input;
@@ -38,6 +40,8 @@ class DependencyVerifier {
 
     private final ProcessRunner processRunner;
 
+    private final ObjectMapper objectMapper;
+
     private final int initialWait;
 
     private final int timeout;
@@ -46,18 +50,20 @@ class DependencyVerifier {
 
     private final TimeUnit timeUnit;
 
-    DependencyVerifier(ProcessRunner processRunner) {
+    DependencyVerifier(ProcessRunner processRunner, ObjectMapper objectMapper) {
         this.processRunner = processRunner;
+        this.objectMapper = objectMapper;
         this.timeUnit = TimeUnit.SECONDS;
         this.initialWait = 15;
         this.timeout = 60 * 10;
         this.waitBetweenRuns = 30;
     }
 
     // for tests
-    DependencyVerifier(ProcessRunner processRunner, int initialWait, int timeout, int waitBetweenRuns,
-            TimeUnit timeUnit) {
+    DependencyVerifier(ProcessRunner processRunner, ObjectMapper objectMapper, int initialWait, int timeout,
+            int waitBetweenRuns, TimeUnit timeUnit) {
         this.processRunner = processRunner;
+        this.objectMapper = objectMapper;
         this.initialWait = initialWait;
         this.timeout = timeout;
         this.waitBetweenRuns = waitBetweenRuns;
@@ -213,23 +219,27 @@ private void waitForDependabotJobsToFinish(String orgRepository, String githubSe
         long startTime = System.currentTimeMillis();
         long timeoutMillis = timeUnit.toMillis(timeout / 2);
         while (System.currentTimeMillis() - startTime < timeoutMillis) {
-            List<String> statuses = curlRuns(orgRepository, githubServerTime, id).stream()
-                .filter(s -> s.contains("\"status\": \""))
-                .map(s -> s.substring(s.lastIndexOf(":") + 1).replace("\"", "").replace(",", "").trim())
-                .toList();
-            if (statuses.isEmpty()) {
-                log.info("No dependabot jobs found");
-            }
-            else {
-                log.info("Found {} Dependabot jobs with statuses {}", statuses.size(), statuses);
-                boolean allCompleted = statuses.stream().allMatch(s -> s.equalsIgnoreCase("completed"));
-                if (allCompleted) {
-                    log.info("All dependabot jobs completed");
-                    return;
+            List<String> curl = curlRuns(orgRepository, githubServerTime, id);
+            try {
+                Workflows workflows = objectMapper.readValue(String.join("\n", curl), Workflows.class);
+                List<Pr> prs = workflows.workflow_runs();
+                if (prs.isEmpty()) {
+                    log.info("No dependabot jobs found");
                 }
+                else {
+                    log.info("Found {} Dependabot jobs with statuses {}", prs.size(), prs);
+                    boolean allCompleted = prs.stream().allMatch(pr -> pr.status().equalsIgnoreCase("completed"));
+                    if (allCompleted) {
+                        log.info("All dependabot jobs completed");
+                        return;
+                    }
+                }
+                log.info("Not all Dependabot jobs processed, will try again...");
+                sleep(waitBetweenRuns);
+            }
+            catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
             }
-            log.info("Not all Dependabot jobs processed, will try again...");
-            sleep(waitBetweenRuns);
         }
         log.error("Failed! Dependabot jobs not processed within the provided timeout");
         throw new IllegalStateException("Timeout waiting for Dependabot jobs to complete");
@@ -241,6 +251,14 @@ List<String> curlRuns(String orgRepository, String githubServerTime, String id)
                         + "&workflow_id=" + id);
     }
 
+    record Pr(String id, String name, String url, String status) {
+
+    }
+
+    record Workflows(List<Pr> workflow_runs) {
+
+    }
+
     private String getDependabotupdatesWorkflowId(String orgRepository) {
         List<String> ids = processRunner.run("gh", "workflow", "list", "-R", orgRepository, "--json", "id,name", "--jq",
                 ".[] | select(.name==\"Dependabot Updates\") | .id");

src/main/java/io/micrometer/release/train/ProjectTrainReleaseWorkflow.java

@@ -20,7 +20,6 @@
 import io.micrometer.release.common.Input;
 import io.micrometer.release.common.ProcessRunner;
 import io.micrometer.release.single.PostReleaseWorkflow;
-
 import io.micrometer.release.train.TrainOptions.ProjectSetup;
 
 import java.net.http.HttpClient;
@@ -31,7 +30,7 @@ public class ProjectTrainReleaseWorkflow {
 
     private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient();
 
-    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+    static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
     private final ReleaseScheduler releaseScheduler;
@@ -46,7 +45,7 @@ public ProjectTrainReleaseWorkflow(String githubOrgRepo, ProcessRunner processRu
             PostReleaseWorkflow postReleaseWorkflow) {
         this.releaseScheduler = new ReleaseScheduler(
                 new CircleCiChecker(System.getenv("CIRCLE_CI_TOKEN"), githubOrgRepo, HTTP_CLIENT, OBJECT_MAPPER),
-                processRunner);
+                OBJECT_MAPPER, processRunner);
         this.versionToBranchConverter = new VersionToBranchConverter(Input.getGhToken(),
                 "https://api.github.com/repos/" + githubOrgRepo + "/branches/", HTTP_CLIENT);
         this.postReleaseTaskScheduler = new PostReleaseTaskScheduler(postReleaseWorkflow, new Git(processRunner),

src/main/java/io/micrometer/release/train/ReleaseScheduler.java

@@ -15,6 +15,7 @@
  */
 package io.micrometer.release.train;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.release.common.Input;
 import io.micrometer.release.common.ProcessRunner;
 import io.micrometer.release.train.TrainOptions.ProjectSetup;
@@ -36,10 +37,10 @@ class ReleaseScheduler {
 
     private final DependencyVerifier dependencyVerifier;
 
-    ReleaseScheduler(CircleCiChecker circleCiChecker, ProcessRunner processRunner) {
+    ReleaseScheduler(CircleCiChecker circleCiChecker, ObjectMapper objectMapper, ProcessRunner processRunner) {
         this.circleCiChecker = circleCiChecker;
         this.processRunner = processRunner;
-        this.dependencyVerifier = new DependencyVerifier(processRunner);
+        this.dependencyVerifier = new DependencyVerifier(processRunner, objectMapper);
     }
 
     // for tests

src/main/java/io/micrometer/release/train/TrainOptions.java

@@ -13,8 +13,6 @@
  */
 package io.micrometer.release.train;
 
-import io.micrometer.release.common.Dependency;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

src/test/java/io/micrometer/release/train/DependencyVerifierTests.java

@@ -59,7 +59,8 @@ class DependencyVerifierTests {
 
     ProcessRunner processRunner = mock();
 
-    DependencyVerifier verifier = new DependencyVerifier(processRunner, 1, 5, 1, TimeUnit.MILLISECONDS) {
+    DependencyVerifier verifier = new DependencyVerifier(processRunner, ProjectTrainReleaseWorkflow.OBJECT_MAPPER, 1, 5,
+            1, TimeUnit.MILLISECONDS) {
         @Override
         GradleParser gradleParser(ProcessRunner branchProcessRunner) {
             return new TestGradleParser();
@@ -145,14 +146,21 @@ void should_fail_when_dependabot_jobs_are_not_successful() {
                 "total_count": 15,
                 "workflow_runs": [
                   {
+                    "id" : 1,
+                    "url": "a",
+                    "name": "foo",
                     "status": "blocked",
                     "event": "pull_request"
                   },
                   {
+                    "id" : 2,
+                    "url": "a",
+                    "name": "bar",
                     "status": "open",
                     "event": "pull_request"
                   }
-                 ]"""));
+                 ]
+                 }"""));
 
         thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer", projectSetup()))
             .isInstanceOf(IllegalStateException.class)

src/test/java/io/micrometer/release/train/ReleaseSchedulerTests.java

@@ -54,7 +54,7 @@ void should_schedule_releases() throws IOException, InterruptedException {
     @Test
     void should_not_make_a_release_when_dependency_check_fails() {
         ReleaseScheduler releaseScheduler = new ReleaseScheduler(checker, processRunner,
-                new DependencyVerifier(processRunner) {
+                new DependencyVerifier(processRunner, ProjectTrainReleaseWorkflow.OBJECT_MAPPER) {
                     @Override
                     void verifyDependencies(String branch, String orgRepository, ProjectSetup projectSetup) {
                         throw new IllegalStateException("BOOM!"); // mock doesn't work for