Skip to content

Commit 893b49d

Browse files
marcingrzejszczakmarcingrzejszczak
committed
WIP
1 parent 61471fb commit 893b49d

File tree

3 files changed

+298
-0
lines changed

3 files changed

+298
-0
lines changed

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

+3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ class ChangelogProcessor {
4141

4242
private final ProcessRunner processRunner;
4343

44+
private final GradleParser gradleParser;
45+
4446
ChangelogProcessor(ProcessRunner processRunner) {
4547
this.processRunner = processRunner;
4648
this.outputFile = new File(OUTPUT_FILE);
49+
this.gradleParser = new GradleParser(processRunner);
4750
}
4851

4952
ChangelogProcessor(ProcessRunner processRunner, File changelogOutput) {

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

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
/*
2+
* Copyright 2025 Broadcom.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.micrometer.release.single;
17+
18+
import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
19+
20+
import io.micrometer.release.common.ProcessRunner;
21+
22+
import java.time.ZonedDateTime;
23+
24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
27+
import java.util.List;
28+
import java.util.concurrent.TimeUnit;
29+
30+
class DependencyVerifier {
31+
32+
private final Logger log = LoggerFactory.getLogger(DependencyVerifier.class);
33+
34+
private final ProcessRunner processRunner;
35+
36+
private final String orgRepository;
37+
38+
private final int initialWaitSeconds;
39+
40+
private final int timeoutSeconds;
41+
42+
private final int waitBetweenRuns;
43+
44+
DependencyVerifier(ProcessRunner processRunner, String orgRepository) {
45+
this.processRunner = processRunner;
46+
this.orgRepository = orgRepository;
47+
this.initialWaitSeconds = 15;
48+
this.timeoutSeconds = 60 * 10;
49+
this.waitBetweenRuns = 30;
50+
}
51+
52+
// for tests
53+
DependencyVerifier(ProcessRunner processRunner, String orgRepository,
54+
int initialWaitSeconds,
55+
int timeoutSeconds, int waitBetweenRuns) {
56+
this.processRunner = processRunner;
57+
this.orgRepository = orgRepository;
58+
this.initialWaitSeconds = initialWaitSeconds;
59+
this.timeoutSeconds = timeoutSeconds;
60+
this.waitBetweenRuns = waitBetweenRuns;
61+
}
62+
63+
void verifyDependencies() {
64+
String githubServerTime = getGitHubServerTime();
65+
triggerDependabotCheck();
66+
log.info("Waiting {} seconds for PRs to be created...", initialWaitSeconds);
67+
sleep(initialWaitSeconds);
68+
waitForDependabotUpdates(githubServerTime);
69+
}
70+
71+
private void sleep(int timeoutSeconds) {
72+
try {
73+
Thread.sleep(TimeUnit.SECONDS.toMillis(timeoutSeconds));
74+
} catch (InterruptedException e) {
75+
throw new IllegalStateException(e);
76+
}
77+
}
78+
79+
private String getGitHubServerTime() {
80+
log.info("Retrieving the GH server time...");
81+
List<String> response = processRunner.run("gh", "api", "/",
82+
"--include");
83+
String dateHeader = response
84+
.stream()
85+
.filter(line -> line.startsWith("Date:"))
86+
.findFirst()
87+
.orElseThrow(() -> new IllegalStateException("Could not get GitHub server time from response headers"));
88+
// Parse RFC 1123 date to ZonedDateTime and format as ISO-8601 (done by default by dateTime.toInstant())
89+
ZonedDateTime dateTime = ZonedDateTime.parse(dateHeader.substring(5).trim(), RFC_1123_DATE_TIME);
90+
String serverTime = dateTime.toInstant().toString();
91+
log.info("GH server time: {}", serverTime);
92+
return serverTime;
93+
}
94+
95+
private void triggerDependabotCheck() {
96+
log.info("Will trigger a Dependabot check...");
97+
processRunner.run("gh", "api",
98+
"/repos/" + orgRepository + "/dispatches",
99+
"-X", "POST",
100+
"-F", "event_type=check-dependencies");
101+
log.info("Triggered Dependabot check");
102+
}
103+
104+
private void waitForDependabotUpdates(String githubServerTime) {
105+
long startTime = System.currentTimeMillis();
106+
long timeoutMillis = TimeUnit.SECONDS.toMillis(timeoutSeconds);
107+
while (System.currentTimeMillis() - startTime < timeoutMillis) {
108+
List<String> openPRs = getOpenMicrometerDependabotPRs(githubServerTime);
109+
if (openPRs.isEmpty()) {
110+
log.info("No pending Micrometer updates");
111+
return;
112+
}
113+
boolean allProcessed = true;
114+
for (String pr : openPRs) {
115+
if (!checkPRStatus(pr)) {
116+
allProcessed = false;
117+
}
118+
}
119+
if (allProcessed) {
120+
log.info("All Dependabot PRs processed");
121+
return;
122+
}
123+
sleep(waitBetweenRuns);
124+
}
125+
throw new IllegalStateException("Timeout waiting for Dependabot updates");
126+
}
127+
128+
private List<String> getOpenMicrometerDependabotPRs(String githubServerTime) {
129+
log.info("Getting open Micrometer related dependabot PRs...");
130+
String result = String.join("\n", processRunner.run("gh", "pr", "list",
131+
"--search",
132+
String.format("is:open author:app/dependabot created:>=%s", githubServerTime),
133+
"--json", "number,title",
134+
"--jq", ".[] | select(.title | contains(\"io.micrometer\")) | .number"));
135+
List<String> prNumbers = result.lines()
136+
.filter(line -> !line.trim().isEmpty())
137+
.toList();
138+
log.info("Got [{}] dependabot PRs related to micrometer", prNumbers.size());
139+
return prNumbers;
140+
}
141+
142+
private boolean checkPRStatus(String prNumber) {
143+
log.info("Will check PR status for PR with number [{}]", prNumber);
144+
String status = String.join("\n", processRunner.run("gh", "pr", "view", prNumber,
145+
"--json", "mergeStateStatus,mergeable,state",
146+
"--jq", "[.mergeStateStatus, .state] | join(\",\")"));
147+
if (status.contains("CONFLICTING")) {
148+
throw new IllegalStateException("PR #" + prNumber + " has conflicts");
149+
}
150+
boolean isCompleted = status.contains("CLOSED") || status.contains("MERGED");
151+
if (isCompleted) {
152+
log.info("PR #{} is completed", prNumber);
153+
} else {
154+
log.info("PR #{} status: {}", prNumber, status);
155+
}
156+
return isCompleted;
157+
}
158+
159+
}

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

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
/*
2+
* Copyright 2025 Broadcom.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.micrometer.release.single;
17+
18+
import io.micrometer.release.common.ProcessRunner;
19+
20+
import java.util.concurrent.atomic.AtomicReference;
21+
22+
import org.slf4j.Logger;
23+
import org.slf4j.LoggerFactory;
24+
25+
import java.util.ArrayList;
26+
import java.util.HashSet;
27+
import java.util.List;
28+
import java.util.Set;
29+
30+
class GradleParser {
31+
32+
private static final Logger log = LoggerFactory.getLogger(GradleParser.class);
33+
34+
private final List<String> excludedDependencyScopes = List.of("testCompile",
35+
"testImplementation", "checkstyle",
36+
"runtime", "nohttp", "testRuntime", "optional");
37+
38+
private final AtomicReference<Set<Dependency>> dependenciesCache = new AtomicReference<>();
39+
40+
private final ProcessRunner processRunner;
41+
42+
GradleParser(ProcessRunner processRunner) {
43+
this.processRunner = processRunner;
44+
}
45+
46+
Set<Dependency> fetchAllDependencies() {
47+
Set<Dependency> cachedDependencies = dependenciesCache.get();
48+
if (cachedDependencies != null) {
49+
log.info("Returned cached dependencies");
50+
return cachedDependencies;
51+
}
52+
log.info("Fetching test and optional dependencies...");
53+
List<String> projectLines = projectLines();
54+
List<String> subprojects = projectLines.stream()
55+
.filter(line -> line.contains("Project") && line.contains(":") && line.contains("'"))
56+
.map(line -> line.substring(line.indexOf(":") + 1, line.lastIndexOf("'")).trim())
57+
.toList();
58+
59+
log.info("Subprojects: {}", subprojects);
60+
61+
Set<Dependency> dependencies = new HashSet<>();
62+
63+
if (!subprojects.isEmpty()) {
64+
List<String> gradleCommand = new ArrayList<>();
65+
gradleCommand.add("./gradlew");
66+
subprojects.forEach(subproject -> gradleCommand.add(subproject + ":dependencies"));
67+
68+
boolean testOrOptional = false;
69+
for (String line : dependenciesLines(gradleCommand)) {
70+
if (line.startsWith("+---") || line.startsWith("\\---")) {
71+
String[] parts = line.split("[: ]");
72+
String version = extractVersion(line);
73+
boolean finalTestOrOptional = testOrOptional;
74+
dependencies.stream()
75+
.filter(dependency -> dependency.group().equalsIgnoreCase(parts[1])
76+
&& dependency.artifact().equalsIgnoreCase(parts[2]))
77+
.findFirst()
78+
.ifPresentOrElse(dependency -> {
79+
log.debug("Dependency {} is already present in compile scope",
80+
parts[1] + ":" + parts[2]);
81+
if (dependency.toIgnore() && !finalTestOrOptional) {
82+
log.debug(
83+
"Dependency {} was previously set in test or compile scope and will be in favour of one in compile scope",
84+
dependency);
85+
dependencies.remove(dependency);
86+
dependencies.add(new Dependency(parts[1], parts[2], version,
87+
finalTestOrOptional));
88+
}
89+
}, () -> dependencies.add(
90+
new Dependency(parts[1], parts[2], version, finalTestOrOptional)));
91+
} else if (excludedDependencyScopes.stream()
92+
.anyMatch(string -> line.toLowerCase().contains(string.toLowerCase()))) {
93+
testOrOptional = true;
94+
} else if (line.isEmpty() || line.isBlank()) {
95+
testOrOptional = false;
96+
}
97+
}
98+
}
99+
dependenciesCache.set(dependencies);
100+
return dependencies;
101+
}
102+
103+
void clearCache() {
104+
dependenciesCache.set(null);
105+
}
106+
107+
static String extractVersion(String line) {
108+
if (line == null || line.trim().isEmpty()) {
109+
return null;
110+
}
111+
if (line.contains("->")) {
112+
String[] parts = line.split("->");
113+
if (parts.length > 1) {
114+
return parts[1].trim().split("\\s+")[0];
115+
}
116+
return null;
117+
}
118+
String[] parts = line.split(":");
119+
if (parts.length < 2) {
120+
return null;
121+
}
122+
if (parts.length >= 3) {
123+
return parts[2].trim().split("\\s+")[0];
124+
}
125+
return null;
126+
}
127+
128+
List<String> dependenciesLines(List<String> gradleCommand) {
129+
return processRunner.runSilently(gradleCommand);
130+
}
131+
132+
List<String> projectLines() {
133+
return processRunner.runSilently("./gradlew", "projects");
134+
}
135+
136+
}

0 commit comments

Comments
 (0)