Skip to content

Commit 8caa3fd

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Added pagination
1 parent a60e6a4 commit 8caa3fd

File tree

8 files changed

+65
-89
lines changed

8 files changed

+65
-89
lines changed

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

+22-29
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.junit.jupiter.api.Test;
2222

2323
import java.time.LocalDate;
24+
import java.util.Arrays;
2425
import java.util.List;
2526

2627
import static org.assertj.core.api.Assertions.assertThat;
@@ -37,53 +38,45 @@ static void should_go_through_whole_flow() {
3738
void should_verify_release_notes_content() throws JsonProcessingException {
3839
Release release = githubClient.getRelease("v0.1.1");
3940

40-
assertThat(release.body()).isEqualToIgnoringWhitespace(
41-
"""
42-
## :star: New Features
43-
44-
- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)
45-
- Foo [#2](https://github.com/micrometer-metrics/build-test/issues/2)
46-
47-
## :lady_beetle: Bug Fixes
48-
49-
- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)
50-
- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)
51-
- Foo2 [#53](https://github.com/micrometer-metrics/build-test/issues/53)
52-
53-
## :hammer: Dependency Upgrades
54-
55-
- Bump com.fasterxml.jackson.core:jackson-databind from 2.17.1 to 2.18.2 [#50](https://github.com/micrometer-metrics/build-test/pull/50)
56-
- Bump com.google.cloud:google-cloud-monitoring from 3.47.0 to 3.56.0 [#51](https://github.com/micrometer-metrics/build-test/pull/51)
57-
- Bump io.micrometer:context-propagation from 1.1.1 to 1.1.2 [#28](https://github.com/micrometer-metrics/build-test/pull/28)
58-
- Bump io.projectreactor:reactor-bom from 2022.0.20 to 2022.0.22 [#49](https://github.com/micrometer-metrics/build-test/pull/49)
59-
- Bump io.spring.develocity.conventions from 0.0.19 to 0.0.22 [#30](https://github.com/micrometer-metrics/build-test/pull/30)
60-
- Bump jakarta.jms:jakarta.jms-api from 3.0.0 to 3.1.0 [#43](https://github.com/micrometer-metrics/build-test/pull/43)
61-
- Bump maven-resolver from 1.9.20 to 1.9.22 [#32](https://github.com/micrometer-metrics/build-test/pull/32)
62-
- Bump me.champeau.gradle:japicmp-gradle-plugin from 0.4.3 to 0.4.5 [#52](https://github.com/micrometer-metrics/build-test/pull/52)
63-
""");
41+
assertThat(release.body()).containsIgnoringWhitespaces(
42+
"Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)")
43+
.containsIgnoringWhitespaces(
44+
"Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)")
45+
.containsIgnoringWhitespaces(
46+
"Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)");
6447
}
6548

6649
@Test
6750
void should_verify_current_milestone() throws JsonProcessingException {
6851
Milestone milestone = githubClient.getMilestoneByTitle("0.1.1");
6952

53+
String[] issueTitles = { "Closed issue in generic 0.1.x", "Closed bug in concrete 0.1.1",
54+
"Closed bug in generic 0.1.x", "Closed enhancement in generic 0.1.x" };
7055
assertThat(milestone.state()).isEqualTo("closed");
7156
List<Issue> issues = githubClient.getIssuesForMilestone(milestone.number());
72-
assertThat(issues).extracting(Issue::state).containsOnly("closed");
57+
assertThat(issues).filteredOn(s -> Arrays.asList(issueTitles).contains(s.title()))
58+
.extracting(Issue::state)
59+
.containsOnly("closed");
7360
assertThat(issues).extracting(Issue::title)
74-
.containsOnly("Closed issue in generic 0.1.x", "Closed bug in concrete 0.1.1",
75-
"Closed bug in generic 0.1.x", "Closed enhancement in generic 0.1.x");
61+
.contains(issueTitles)
62+
.doesNotContain("Open issue in concrete 0.1.1");
7663
}
7764

7865
@Test
7966
void should_verify_next_milestone() throws JsonProcessingException {
8067
Milestone milestone = githubClient.getMilestoneByTitle("0.1.2");
8168

69+
String[] issueTitles = { "Closed issue in generic 0.1.x", "Closed bug in concrete 0.1.1",
70+
"Closed bug in generic 0.1.x", "Closed enhancement in generic 0.1.x" };
8271
assertThat(milestone.state()).isEqualTo("open");
8372
assertThat(milestone.dueOn()).isEqualTo(ReleaseDateCalculator.calculateDueDate(LocalDate.now()));
8473
List<Issue> issues = githubClient.getIssuesForMilestone(milestone.number());
85-
assertThat(issues).extracting(Issue::state).containsOnly("open");
86-
assertThat(issues).extracting(Issue::title).containsOnly("Open issue in concrete 0.1.1");
74+
assertThat(issues).filteredOn(s -> "Open issue in concrete 0.1.1".equalsIgnoreCase(s.title()))
75+
.extracting(Issue::state)
76+
.containsOnly("closed");
77+
assertThat(issues).extracting(Issue::title)
78+
.contains("Open issue in concrete 0.1.1")
79+
.doesNotContain(issueTitles);
8780
}
8881

8982
@Test

‎src/e2eTest/java/io/micrometer/release/train/TrainGithubActionsE2eTests.java

+25-43
Original file line numberDiff line numberDiff line change
@@ -39,60 +39,39 @@ static void should_go_through_whole_flow() {
3939
void should_verify_release_notes_content_for_ga() throws JsonProcessingException {
4040
Release release = githubClient.getRelease("v0.1.1");
4141

42-
assertThat(release.body()).isEqualToIgnoringWhitespace(
43-
"""
44-
## :star: New Features
45-
46-
- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)
47-
48-
## :lady_beetle: Bug Fixes
49-
50-
- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)
51-
- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)
52-
""");
42+
assertThat(release.body()).containsIgnoringWhitespaces(
43+
"- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)",
44+
"- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)",
45+
"- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)");
5346
}
5447

5548
@Test
5649
void should_verify_release_notes_content_for_M2() throws JsonProcessingException {
5750
Release release = githubClient.getRelease("v0.2.0-M2");
5851

59-
assertThat(release.body()).isEqualToIgnoringWhitespace(
60-
"""
61-
## :star: New Features
62-
63-
- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)
64-
- Closed enhancement in generic 0.2.x [#14](https://github.com/marcingrzejszczak/gh-actions-test/issues/14)
65-
66-
## :lady_beetle: Bug Fixes
67-
68-
- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)
69-
- Closed bug in concrete 0.2.0-M2 [#18](https://github.com/marcingrzejszczak/gh-actions-test/issues/18)
70-
- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)
71-
- Closed bug in generic 0.2.x [#15](https://github.com/marcingrzejszczak/gh-actions-test/issues/15)
72-
""");
52+
assertThat(release.body()).containsIgnoringWhitespaces(
53+
"- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)",
54+
"- Closed enhancement in generic 0.2.x [#14](https://github.com/marcingrzejszczak/gh-actions-test/issues/14)",
55+
"- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)",
56+
"- Closed bug in concrete 0.2.0-M2 [#18](https://github.com/marcingrzejszczak/gh-actions-test/issues/18)",
57+
"- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)",
58+
"- Closed bug in generic 0.2.x [#15](https://github.com/marcingrzejszczak/gh-actions-test/issues/15)");
7359
}
7460

7561
@Test
7662
void should_verify_release_notes_content_for_RC1() throws JsonProcessingException {
7763
Release release = githubClient.getRelease("v1.0.0-RC1");
7864

79-
assertThat(release.body()).isEqualToIgnoringWhitespace(
80-
"""
81-
## :star: New Features
82-
83-
- Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)
84-
- Closed enhancement in generic 0.2.x [#14](https://github.com/marcingrzejszczak/gh-actions-test/issues/14)
85-
- Closed enhancement in generic 1.0.x [#5](https://github.com/marcingrzejszczak/gh-actions-test/issues/5)
86-
87-
## :lady_beetle: Bug Fixes
88-
89-
- Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)
90-
- Closed bug in concrete 0.2.0-M2 [#18](https://github.com/marcingrzejszczak/gh-actions-test/issues/18)
91-
- Closed bug in concrete 1.0.0-RC1 [#3](https://github.com/marcingrzejszczak/gh-actions-test/issues/3)
92-
- Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)
93-
- Closed bug in generic 0.2.x [#15](https://github.com/marcingrzejszczak/gh-actions-test/issues/15)
94-
- Closed bug in generic 1.0.x [#4](https://github.com/marcingrzejszczak/gh-actions-test/issues/4)
95-
""");
65+
assertThat(release.body()).containsIgnoringWhitespaces(
66+
"Closed enhancement in generic 0.1.x [#8](https://github.com/marcingrzejszczak/gh-actions-test/issues/8)",
67+
"Closed enhancement in generic 0.2.x [#14](https://github.com/marcingrzejszczak/gh-actions-test/issues/14)",
68+
"Closed enhancement in generic 1.0.x [#5](https://github.com/marcingrzejszczak/gh-actions-test/issues/5)",
69+
"Closed bug in concrete 0.1.1 [#12](https://github.com/marcingrzejszczak/gh-actions-test/issues/12)",
70+
"Closed bug in concrete 0.2.0-M2 [#18](https://github.com/marcingrzejszczak/gh-actions-test/issues/18)",
71+
"Closed bug in concrete 1.0.0-RC1 [#3](https://github.com/marcingrzejszczak/gh-actions-test/issues/3)",
72+
"Closed bug in generic 0.1.x [#9](https://github.com/marcingrzejszczak/gh-actions-test/issues/9)",
73+
"Closed bug in generic 0.2.x [#15](https://github.com/marcingrzejszczak/gh-actions-test/issues/15)",
74+
"Closed bug in generic 1.0.x [#4](https://github.com/marcingrzejszczak/gh-actions-test/issues/4)");
9675
}
9776

9877
@ParameterizedTest
@@ -105,6 +84,7 @@ void should_verify_current_milestone(String version) throws JsonProcessingExcept
10584
List<Issue> issues = githubClient.getIssuesForMilestone(milestone.number());
10685
assertThat(issues).extracting(Issue::state).containsOnly("closed");
10786
assertThat(issues).extracting(Issue::title)
87+
.doesNotMatch(strings -> strings.stream().noneMatch(s -> s.contains("Open issue")))
10888
.containsOnly("Closed issue in generic " + generic, "Closed bug in concrete " + version,
10989
"Closed bug in generic " + generic, "Closed enhancement in generic " + generic);
11090
}
@@ -122,7 +102,9 @@ void should_verify_next_milestone(String next, String previous) throws JsonProce
122102
assertThat(milestone.dueOn()).isEqualTo(calculateDueDate(LocalDate.now()));
123103
List<Issue> issues = githubClient.getIssuesForMilestone(milestone.number());
124104
assertThat(issues).extracting(Issue::state).containsOnly("open");
125-
assertThat(issues).extracting(Issue::title).containsOnly("Open issue in concrete " + previous);
105+
assertThat(issues).extracting(Issue::title)
106+
.doesNotMatch(strings -> strings.stream().noneMatch(s -> s.contains("in generic")))
107+
.contains("Open issue in concrete " + previous);
126108
}
127109

128110
@ParameterizedTest

‎src/main/java/io/micrometer/release/single/MilestoneIssueReassigner.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ MilestoneWithDeadline reassignIssues(Milestone concreteMilestone, String refName
5252

5353
private void reassignIssues(List<Integer> issueNumbers, int milestoneNumber) {
5454
for (Integer issueNumber : issueNumbers) {
55-
processRunner.run("gh", "api", String.format("/repos/%s/issues/%d", ghRepo, issueNumber), "-X", "PATCH",
56-
"-f", String.format("milestone=%d", milestoneNumber));
55+
processRunner.run("gh", "api", "--paginate", String.format("/repos/%s/issues/%d", ghRepo, issueNumber),
56+
"-X", "PATCH", "-f", String.format("milestone=%d", milestoneNumber));
5757
}
5858
}
5959

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private MilestoneWithDeadline reassignIssues(String refName, Milestone genericMi
8989
}
9090

9191
Milestone findMilestone(String title) {
92-
List<String> lines = processRunner.run("gh", "api", "/repos/" + ghOrgRepo + "/milestones", "--jq",
92+
List<String> lines = processRunner.run("gh", "api", "--paginate", "/repos/" + ghOrgRepo + "/milestones", "--jq",
9393
String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", title));
9494
if (lines.isEmpty()) {
9595
throw new IllegalStateException("No response from gh cli for version <" + title + ">");
@@ -105,7 +105,7 @@ Milestone findMilestone(String title) {
105105
}
106106

107107
private List<Issue> getIssuesForMilestone(int milestoneNumber) {
108-
List<String> lines = processRunner.run("gh", "api",
108+
List<String> lines = processRunner.run("gh", "api", "--paginate",
109109
String.format("/repos/%s/issues?milestone=%d&state=all", ghOrgRepo, milestoneNumber), "--jq",
110110
".[] | {number: .number, state: .state}");
111111
List<Issue> issues = new ArrayList<>();

‎src/test/java/io/micrometer/release/common/GithubActions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class GithubClient {
130130

131131
public Release getRelease(String tag) throws JsonProcessingException {
132132
String output = String.join("\n",
133-
processRunner.run("gh", "api", "/repos/" + repo + "/releases/tags/" + tag));
133+
processRunner.run("gh", "api", "--paginate", "/repos/" + repo + "/releases/tags/" + tag));
134134
return parseReleaseFromJson(output);
135135
}
136136

@@ -145,18 +145,18 @@ public void createReleaseAndTag(String tagName) {
145145

146146
public Milestone getMilestoneByTitle(String title) throws JsonProcessingException {
147147
String output = String.join("\n",
148-
processRunner.run("gh", "api", "/repos/" + repo + "/milestones?state=all"));
148+
processRunner.run("gh", "api", "--paginate", "/repos/" + repo + "/milestones?state=all"));
149149
return parseMilestoneFromJson(output, title);
150150
}
151151

152152
public List<Issue> getIssuesForMilestone(int milestoneNumber) throws JsonProcessingException {
153-
String output = String.join("\n", processRunner.run("gh", "api",
153+
String output = String.join("\n", processRunner.run("gh", "api", "--paginate",
154154
"/repos/" + repo + "/issues?milestone=" + milestoneNumber + "&state=all"));
155155
return parseIssuesFromJson(output);
156156
}
157157

158158
public List<Issue> getClosedIssuesForMilestone(int milestoneNumber) throws JsonProcessingException {
159-
String output = String.join("\n", processRunner.run("gh", "api",
159+
String output = String.join("\n", processRunner.run("gh", "api", "--paginate",
160160
"/repos/" + repo + "/issues?milestone=" + milestoneNumber + "&state=closed"));
161161
return parseIssuesFromJson(output);
162162
}

‎src/test/java/io/micrometer/release/single/MilestoneIssueReassignerTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ private static void thenMilestoneHasProperDeadline(MilestoneWithDeadline milesto
9696
}
9797

9898
private void thenClosedIssuesFromGenericMilestoneGotMovedToConcreteMilestone(Milestone concreteMilestone) {
99-
verify(processRunner).run("gh", "api", String.format("/repos/%s/issues/%d", GH_REPO, CLOSED_ISSUE_ID), "-X",
100-
"PATCH", "-f", String.format("milestone=%d", concreteMilestone.number()));
99+
verify(processRunner).run("gh", "api", "--paginate",
100+
String.format("/repos/%s/issues/%d", GH_REPO, CLOSED_ISSUE_ID), "-X", "PATCH", "-f",
101+
String.format("milestone=%d", concreteMilestone.number()));
101102
}
102103

103104
}

‎src/test/java/io/micrometer/release/single/MilestoneMigratorTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ void should_throw_exception_when_no_generic_milestone_found() {
7070
void should_reassign_issues_from_generic_milestone_to_concrete_one() {
7171
String concrete = "1.0.0";
7272
String generic = "1.0.x";
73-
when(runner.run("gh", "api", "/repos/" + GH_REPO + "/milestones", "--jq",
73+
when(runner.run("gh", "api", "--paginate", "/repos/" + GH_REPO + "/milestones", "--jq",
7474
String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", concrete)))
7575
.thenReturn(Collections.singletonList("{\"number\":5,\"title\":\"" + concrete + "\"}")); // concrete
76-
when(runner.run("gh", "api", "/repos/" + GH_REPO + "/milestones", "--jq",
76+
when(runner.run("gh", "api", "--paginate", "/repos/" + GH_REPO + "/milestones", "--jq",
7777
String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", generic)))
7878
.thenReturn(Collections.singletonList("{\"number\":4,\"title\":\"" + generic + "\"}")); // generic
79-
when(runner.run("gh", "api", String.format("/repos/%s/issues?milestone=%d&state=all", GH_REPO, 5), "--jq",
80-
".[] | {number: .number, state: .state}"))
79+
when(runner.run("gh", "api", "--paginate", String.format("/repos/%s/issues?milestone=%d&state=all", GH_REPO, 5),
80+
"--jq", ".[] | {number: .number, state: .state}"))
8181
.thenReturn(Collections.singletonList("{\"number\":10,\"state\":\"open\"}")); // concrete
82-
when(runner.run("gh", "api", String.format("/repos/%s/issues?milestone=%d&state=all", GH_REPO, 4), "--jq",
83-
".[] | {number: .number, state: .state}"))
82+
when(runner.run("gh", "api", "--paginate", String.format("/repos/%s/issues?milestone=%d&state=all", GH_REPO, 4),
83+
"--jq", ".[] | {number: .number, state: .state}"))
8484
.thenReturn(Collections.singletonList("{\"number\":11,\"state\":\"closed\"}")); // generic
8585
MilestoneWithDeadline expectedMilestone = new MilestoneWithDeadline(12, "1.0.1", LocalDate.of(2025, 1, 1));
8686
when(reasigner.reassignIssues(new Milestone(5, concrete), "v" + concrete, Collections.singletonList(11),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MilestoneUpdaterTests {
2929
@Test
3030
void should_call_gh_api_to_close_a_milestone() {
3131
ProcessRunner processRunner = mock();
32-
given(processRunner.run("gh", "api", "/repos/micrometer-metrics/micrometer/milestones", "--jq",
32+
given(processRunner.run("gh", "api", "--paginate", "/repos/micrometer-metrics/micrometer/milestones", "--jq",
3333
String.format(".[] | select(.title == \"%s\") | {number: .number, title: .title}", "1.2.3")))
3434
.willReturn(List.of("{\"number\":100,\"title\":\"1.2.3\"}"));
3535
String ghRepo = "micrometer-metrics/micrometer";

0 commit comments

Comments
 (0)