Fixed code to work with milestone closing

Author: marcingrzejszczak

src/main/java/io/micrometer/release/single/MilestoneMigrator.java

@@ -29,13 +29,13 @@ class MilestoneMigrator {
 
     private final ProcessRunner processRunner;
 
-    private final String ghRepo;
+    private final String ghOrgRepo;
 
     private final MilestoneIssueReassigner milestoneIssueReassigner;
 
     MilestoneMigrator(ProcessRunner processRunner, String ghRepo, MilestoneIssueReassigner milestoneIssueReassigner) {
         this.processRunner = processRunner;
-        this.ghRepo = ghRepo;
+        this.ghOrgRepo = ghRepo;
         this.milestoneIssueReassigner = milestoneIssueReassigner;
     }
 
@@ -88,8 +88,8 @@ private MilestoneWithDeadline reassignIssues(String refName, Milestone genericMi
         return milestoneIssueReassigner.reassignIssues(concreteMilestone, refName, closedIssues, openIssues);
     }
 
-    private Milestone findMilestone(String title) {
-        List<String> lines = processRunner.run("gh", "api", "/repos/" + ghRepo + "/milestones", "--jq",
+    Milestone findMilestone(String title) {
+        List<String> lines = processRunner.run("gh", "api", "/repos/" + ghOrgRepo + "/milestones", "--jq",
                 String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", title));
         if (lines.isEmpty()) {
             throw new IllegalStateException("No response from gh cli for version <" + title + ">");
@@ -106,7 +106,7 @@ private Milestone findMilestone(String title) {
 
     private List<Issue> getIssuesForMilestone(int milestoneNumber) {
         List<String> lines = processRunner.run("gh", "api",
-                String.format("/repos/%s/issues?milestone=%d&state=all", ghRepo, milestoneNumber), "--jq",
+                String.format("/repos/%s/issues?milestone=%d&state=all", ghOrgRepo, milestoneNumber), "--jq",
                 ".[] | {number: .number, state: .state}");
         List<Issue> issues = new ArrayList<>();
         for (String line : lines) {

src/main/java/io/micrometer/release/single/MilestoneUpdater.java

@@ -16,11 +16,10 @@
 package io.micrometer.release.single;
 
 import io.micrometer.release.common.ProcessRunner;
+import io.micrometer.release.single.MilestoneMigrator.Milestone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 class MilestoneUpdater {
 
     private static final Logger log = LoggerFactory.getLogger(MilestoneUpdater.class);
@@ -51,13 +50,11 @@ MilestoneWithDeadline updateMilestones(String githubRefName) {
     void closeMilestone(String githubRefName) {
         log.info("Closing milestone...");
         String milestoneName = githubRefName.replace("v", "");
-        List<String> output = processRunner.run("gh", "api", "/repos/" + githubRepository + "/milestones?state=open",
-                "--jq", "\".[] | select(.title == \\\"" + milestoneName + "\\\").number\"");
+        Milestone milestone = milestoneMigrator.findMilestone(milestoneName);
 
-        if (!output.isEmpty()) {
-            String milestoneNumber = output.get(0);
+        if (milestone != null) {
             processRunner.run("gh", "api", "-X", "PATCH",
-                    "/repos/" + githubRepository + "/milestones/" + milestoneNumber, "-f", "state=closed");
+                    "/repos/" + githubRepository + "/milestones/" + milestone.number(), "-f", "state=closed");
             log.info("Successfully closed milestone {}", milestoneName);
         }
         else {

src/test/java/io/micrometer/release/single/MilestoneUpdaterTests.java

@@ -30,17 +30,17 @@ class MilestoneUpdaterTests {
     @Test
     void should_call_gh_api_to_close_a_milestone() {
         ProcessRunner processRunner = mock();
-        given(processRunner.run("gh", "api", "/repos/micrometer-metrics/milestones?state=open", "--jq",
-                "\".[] | select(.title == \\\"1.2.3\\\").number\""))
-            .willReturn(List.of("100"));
-        String ghRepo = "micrometer-metrics";
+        given(processRunner.run("gh", "api", "/repos/micrometer-metrics/micrometer/milestones", "--jq",
+                String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", "1.2.3")))
+            .willReturn(List.of("{\"number\":100,\"title\":\"1.2.3\"}"));
+        String ghRepo = "micrometer-metrics/micrometer";
         MilestoneUpdater milestoneUpdater = new MilestoneUpdater(processRunner, ghRepo,
                 new MilestoneMigrator(processRunner, ghRepo, new MilestoneIssueReassigner(processRunner, ghRepo)));
 
         milestoneUpdater.closeMilestone("v1.2.3");
 
-        verify(processRunner).run("gh", "api", "-X", "PATCH", "/repos/micrometer-metrics/milestones/100", "-f",
-                "state=closed");
+        verify(processRunner).run("gh", "api", "-X", "PATCH", "/repos/micrometer-metrics/micrometer/milestones/100",
+                "-f", "state=closed");
     }
 
 }