Skip to content

Commit 53bce43

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Updated the way time is taken from github
1 parent fd367ec commit 53bce43

File tree

2 files changed

+38
-58
lines changed

2 files changed

+38
-58
lines changed

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

+21-22
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,12 @@
2424
import java.io.File;
2525
import java.nio.file.Files;
2626
import java.nio.file.Path;
27-
import java.time.ZonedDateTime;
2827
import java.util.HashSet;
2928
import java.util.List;
3029
import java.util.Set;
3130
import java.util.concurrent.TimeUnit;
3231
import java.util.stream.Collectors;
3332

34-
import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
35-
3633
class DependencyVerifier {
3734

3835
private final Logger log = LoggerFactory.getLogger(DependencyVerifier.class);
@@ -104,7 +101,7 @@ private void assertDependencyDiff(Status status, Set<Dependency> diff) {
104101
}
105102

106103
private Status dependabotUpdateStatus(File clonedRepo, String orgRepository) {
107-
String githubServerTime = getGitHubServerTime();
104+
String githubServerTime = getGitHubServerTime(orgRepository);
108105
triggerDependabotCheck(orgRepository, clonedRepo);
109106
waitForDependabotJobsToFinish(orgRepository, githubServerTime);
110107
return waitForDependabotPrsToFinish(githubServerTime);
@@ -147,19 +144,17 @@ private void sleep(int timeoutToSleep) {
147144
}
148145
}
149146

150-
private String getGitHubServerTime() {
147+
private String getGitHubServerTime(String orgRepository) {
151148
log.info("Retrieving the GH server time...");
152-
List<String> response = processRunner.run("gh", "api", "/", "--include");
153-
String dateHeader = response.stream()
154-
.filter(line -> line.startsWith("Date:"))
155-
.findFirst()
156-
.orElseThrow(() -> new IllegalStateException("Could not get GitHub server time from response headers"));
157-
// Parse RFC 1123 date to ZonedDateTime and format as ISO-8601 (done by default by
158-
// dateTime.toInstant())
159-
ZonedDateTime dateTime = ZonedDateTime.parse(dateHeader.substring(5).trim(), RFC_1123_DATE_TIME);
160-
String serverTime = dateTime.toInstant().toString();
161-
log.info("GH server time: {}", serverTime);
162-
return serverTime;
149+
String id = getDependabotupdatesWorkflowId(orgRepository);
150+
List<String> latestJobDates = processRunner.run("gh", "run", "list", "--workflow=" + id, "-R", orgRepository,
151+
"--json=createdAt", "--jq=.[].createdAt", "--limit=1");
152+
if (latestJobDates.isEmpty()) {
153+
throw new IllegalStateException("Can't get Github server time because no dependabot jobs were ever ran");
154+
}
155+
String date = latestJobDates.get(0);
156+
log.info("GH server time: {}", date);
157+
return date;
163158
}
164159

165160
private void triggerDependabotCheck(String orgRepository, File clonedRepo) {
@@ -209,12 +204,7 @@ private void waitForDependabotJobsToFinish(String orgRepository, String githubSe
209204
log.info("Waiting {} {} for Dependabot jobs to be created...", initialWait, timeUnit);
210205
sleep(initialWait);
211206
log.info("Waiting for Dependabot jobs to finish...");
212-
List<String> ids = processRunner.run("gh", "workflow", "list", "-R", orgRepository, "--json", "id,name", "--jq",
213-
".[] | select(.name==\"Dependabot Updates\") | .id");
214-
if (ids.isEmpty()) {
215-
throw new IllegalStateException("Could not find dependabot updates");
216-
}
217-
String id = ids.get(0);
207+
String id = getDependabotupdatesWorkflowId(orgRepository);
218208
long startTime = System.currentTimeMillis();
219209
long timeoutMillis = timeUnit.toMillis(timeout / 2);
220210
while (System.currentTimeMillis() - startTime < timeoutMillis) {
@@ -238,6 +228,15 @@ private void waitForDependabotJobsToFinish(String orgRepository, String githubSe
238228
throw new IllegalStateException("Timeout waiting for Dependabot jobs to complete");
239229
}
240230

231+
private String getDependabotupdatesWorkflowId(String orgRepository) {
232+
List<String> ids = processRunner.run("gh", "workflow", "list", "-R", orgRepository, "--json", "id,name", "--jq",
233+
".[] | select(.name==\"Dependabot Updates\") | .id");
234+
if (ids.isEmpty()) {
235+
throw new IllegalStateException("Could not find dependabot updates");
236+
}
237+
return ids.get(0);
238+
}
239+
241240
private Status waitForDependabotPrsToFinish(String githubServerTime) {
242241
log.info("Waiting {} {} for Dependabot PRs to be created...", initialWait, timeUnit);
243242
sleep(initialWait);

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

+17-36
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
import org.mockito.Mockito;
2525

2626
import java.io.File;
27-
import java.io.IOException;
2827
import java.net.URISyntaxException;
29-
import java.nio.file.Files;
3028
import java.util.Collections;
3129
import java.util.List;
3230
import java.util.concurrent.TimeUnit;
@@ -50,12 +48,12 @@ class DependencyVerifierTests {
5048
"micrometer-metrics/micrometer", "--json", "id,name", "--jq",
5149
".[] | select(.name==\"Dependabot Updates\") | .id" };
5250

51+
private static final String[] dependabotUpdateJobTime = { "gh", "run", "list", "--workflow=1234", "-R",
52+
"micrometer-metrics/micrometer", "--json=createdAt", "--jq=.[].createdAt", "--limit=1" };
53+
5354
private static final String[] dependabotUpdateJobStates = { "gh", "run", "list", "--workflow=1234", "-R",
5455
"micrometer-metrics/micrometer", "--created='>2025-02-24T10:51:29Z'", "--json=status", "--jq=.[].status" };
5556

56-
File ghServerTimeResponse = new File(
57-
DependencyVerifierTests.class.getResource("/dependencyVerifier/getGhServerTime.txt").toURI());
58-
5957
ProcessRunner processRunner = mock();
6058

6159
DependencyVerifier verifier = new DependencyVerifier(processRunner, 1, 5, 1, TimeUnit.MILLISECONDS) {
@@ -85,7 +83,7 @@ ProcessRunner processRunnerForBranch(File clonedRepo) {
8583
}
8684
};
8785

88-
DependencyVerifierTests() throws URISyntaxException {
86+
DependencyVerifierTests() {
8987
}
9088

9189
@BeforeEach
@@ -96,9 +94,8 @@ void setup() {
9694

9795
@Test
9896
@SuppressWarnings("unchecked")
99-
void should_receive_updated_dependabot_status() throws IOException {
100-
given(processRunner.run("gh", "api", "/", "--include"))
101-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
97+
void should_receive_updated_dependabot_status() {
98+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
10299
given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"),
103100
Collections.singletonList("1234"), Collections.emptyList());
104101
given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("BLOCKED,OPEN"),
@@ -107,7 +104,7 @@ void should_receive_updated_dependabot_status() throws IOException {
107104
verifier.verifyDependencies("main", "micrometer-metrics/micrometer");
108105

109106
InOrder inOrder = Mockito.inOrder(processRunner);
110-
inOrder.verify(processRunner).run("gh", "api", "/", "--include");
107+
inOrder.verify(processRunner).run(dependabotUpdateJobTime);
111108
inOrder.verify(processRunner)
112109
.run("git", "remote", "set-url", "origin",
113110
"https://x-access-token:[email protected]/micrometer-metrics/micrometer.git");
@@ -123,9 +120,8 @@ void should_receive_updated_dependabot_status() throws IOException {
123120

124121
@Test
125122
@SuppressWarnings("unchecked")
126-
void should_fail_when_no_dependabot_jobs_present() throws IOException {
127-
given(processRunner.run("gh", "api", "/", "--include"))
128-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
123+
void should_fail_when_no_dependabot_jobs_present() {
124+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
129125
given(processRunner.run(dependabotUpdateJobsIds)).willReturn(Collections.emptyList());
130126

131127
thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
@@ -135,9 +131,8 @@ void should_fail_when_no_dependabot_jobs_present() throws IOException {
135131

136132
@Test
137133
@SuppressWarnings("unchecked")
138-
void should_fail_when_dependabot_jobs_are_not_successful() throws IOException {
139-
given(processRunner.run("gh", "api", "/", "--include"))
140-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
134+
void should_fail_when_dependabot_jobs_are_not_successful() {
135+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
141136
given(processRunner.run(dependabotUpdateJobStates)).willReturn(List.of(), List.of("BLOCKED", "OPEN"));
142137

143138
thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
@@ -147,29 +142,16 @@ void should_fail_when_dependabot_jobs_are_not_successful() throws IOException {
147142

148143
@Test
149144
void should_throw_exception_when_gh_server_time_cannot_be_retrieved() {
150-
given(processRunner.run("gh", "api", "/", "--include")).willReturn(Collections.emptyList());
145+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(Collections.emptyList());
151146

152147
thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
153148
.isInstanceOf(IllegalStateException.class)
154-
.hasMessageContaining("Could not get GitHub server time from response headers");
155-
}
156-
157-
@Test
158-
void should_throw_exception_when_no_dependabot_jobs() throws IOException {
159-
given(processRunner.run("gh", "api", "/", "--include"))
160-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
161-
given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"));
162-
given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("CONFLICTING"));
163-
164-
thenThrownBy(() -> verifier.verifyDependencies("main", "micrometer-metrics/micrometer"))
165-
.isInstanceOf(IllegalStateException.class)
166-
.hasMessageContaining("PR #1234 has conflicts");
149+
.hasMessageContaining("Can't get Github server time because no dependabot jobs were ever ran");
167150
}
168151

169152
@Test
170-
void should_throw_exception_when_dependabot_pr_is_conflicting() throws IOException {
171-
given(processRunner.run("gh", "api", "/", "--include"))
172-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
153+
void should_throw_exception_when_dependabot_pr_is_conflicting() {
154+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
173155
given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"));
174156
given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("CONFLICTING"));
175157

@@ -179,9 +161,8 @@ void should_throw_exception_when_dependabot_pr_is_conflicting() throws IOExcepti
179161
}
180162

181163
@Test
182-
void should_throw_exception_when_timeout() throws IOException {
183-
given(processRunner.run("gh", "api", "/", "--include"))
184-
.willReturn(Files.readAllLines(ghServerTimeResponse.toPath()));
164+
void should_throw_exception_when_timeout() {
165+
given(processRunner.run(dependabotUpdateJobTime)).willReturn(List.of("2025-02-24T10:51:29Z"));
185166
given(processRunner.run(dependabotCreatedPrNumbers)).willReturn(Collections.singletonList("1234"));
186167
given(processRunner.run(dependabotPrState)).willReturn(Collections.singletonList("BLOCKED,OPEN"));
187168

0 commit comments

Comments
 (0)