Trying out curl

Author: marcingrzejszczak

src/e2eTest/java/io/micrometer/release/single/SingleProjectGithubActionsE2eTests.java

@@ -18,13 +18,15 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.micrometer.release.common.GithubActions;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Disabled("TODO: Remove me")
 class SingleProjectGithubActionsE2eTests implements GithubActions {
 
     @BeforeAll

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

@@ -208,8 +208,10 @@ 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 = processRunner.run("gh", "run", "list", "--workflow=" + id, "-R", orgRepository,
-                    "--created='>" + githubServerTime + "'", "--json=status", "--jq=.[].status");
+            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");
             }
@@ -228,6 +230,11 @@ private void waitForDependabotJobsToFinish(String orgRepository, String githubSe
         throw new IllegalStateException("Timeout waiting for Dependabot jobs to complete");
     }
 
+    List<String> curlRuns(String orgRepository, String githubServerTime, String id) {
+        return processRunner.run("curl", "-H", "Authorization: token " + ghToken(), "https://api.github.com/repos/"
+                + orgRepository + "/actions/runs?created=>" + githubServerTime + "&workflow_id=" + id);
+    }
+
     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/test/java/io/micrometer/release/train/DependencyVerifierTests.java

@@ -18,6 +18,10 @@
 import io.micrometer.release.common.GradleParser;
 import io.micrometer.release.common.ProcessRunner;
 import io.micrometer.release.common.TestGradleParser;
+
+import java.io.IOException;
+import java.nio.file.Files;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
@@ -51,8 +55,8 @@ class DependencyVerifierTests {
     private static final String[] dependabotUpdateJobTime = { "gh", "run", "list", "--workflow=1234", "-R",
             "micrometer-metrics/micrometer", "--json=createdAt", "--jq=.[].createdAt", "--limit=1" };
 
-    private static final String[] dependabotUpdateJobStates = { "gh", "run", "list", "--workflow=1234", "-R",
-            "micrometer-metrics/micrometer", "--created='>2025-02-24T10:51:29Z'", "--json=status", "--jq=.[].status" };
+    private static final String[] dependabotUpdateJobStates = { "curl", "-H", "Authorization: token 1234567890",
+            "https://api.github.com/repos/micrometer-metrics/micrometer/actions/runs?created=>2025-02-24T10:51:29Z&workflow_id=1234" };
 
     ProcessRunner processRunner = mock();
 
@@ -87,15 +91,16 @@ ProcessRunner processRunnerForBranch(File clonedRepo) {
     }
 
     @BeforeEach
-    void setup() {
+    void setup() throws URISyntaxException, IOException {
         given(processRunner.run(dependabotUpdateJobsIds)).willReturn(List.of("1234"));
-        given(processRunner.run(dependabotUpdateJobStates)).willReturn(List.of("completed"));
+        given(processRunner.run(dependabotUpdateJobStates)).willReturn(Files
+            .readAllLines(new File(DependencyVerifierTests.class.getResource("/github/runs.json").toURI()).toPath()));
+        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
     }
 
     @Test
     @SuppressWarnings("unchecked")
     void should_receive_updated_dependabot_status() {
-        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
         given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"),
                 Collections.singletonList("1234"), Collections.emptyList());
         given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("BLOCKED,OPEN"),
@@ -121,7 +126,6 @@ void should_receive_updated_dependabot_status() {
     @Test
     @SuppressWarnings("unchecked")
     void should_fail_when_no_dependabot_jobs_present() {
-        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
         given(processRunner.run(dependabotUpdateJobsIds)).willReturn(Collections.emptyList());
 
         thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
@@ -132,8 +136,19 @@ void should_fail_when_no_dependabot_jobs_present() {
     @Test
     @SuppressWarnings("unchecked")
     void should_fail_when_dependabot_jobs_are_not_successful() {
-        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
-        given(processRunner.run(dependabotUpdateJobStates)).willReturn(List.of(), List.of("BLOCKED", "OPEN"));
+        given(processRunner.run(dependabotUpdateJobStates)).willReturn(List.of("", """
+                          {
+                "total_count": 15,
+                "workflow_runs": [
+                  {
+                    "status": "blocked",
+                    "event": "pull_request"
+                  },
+                  {
+                    "status": "open",
+                    "event": "pull_request"
+                  }
+                 ]"""));
 
         thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
             .isInstanceOf(IllegalStateException.class)
@@ -151,7 +166,6 @@ void should_throw_exception_when_gh_server_time_cannot_be_retrieved() {
 
     @Test
     void should_throw_exception_when_dependabot_pr_is_conflicting() {
-        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
         given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"));
         given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("CONFLICTING"));
 
@@ -162,7 +176,6 @@ void should_throw_exception_when_dependabot_pr_is_conflicting() {
 
     @Test
     void should_throw_exception_when_timeout() {
-        given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
         given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"));
         given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("BLOCKED,OPEN"));