Skip to content

Commit f95f591

Browse files
marcingrzejszczakmarcingrzejszczak
committed
WIP
1 parent 531df6d commit f95f591

14 files changed

+206
-117
lines changed

‎src/main/java/io/micrometer/release/Main.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.release;
1717

18+
import io.micrometer.release.common.Input;
1819
import io.micrometer.release.common.ProcessRunner;
1920
import io.micrometer.release.single.PostReleaseWorkflow;
2021
import io.micrometer.release.train.ProjectTrainReleaseWorkflow;
@@ -47,7 +48,7 @@ public static void main(String[] args) throws Exception {
4748
void run() {
4849
ProcessRunner processRunner = new ProcessRunner();
4950
PostReleaseWorkflow postReleaseWorkflow = newPostReleaseWorkflow(processRunner);
50-
String githubOrgRepo = getGithubRepository();
51+
String githubOrgRepo = getGithubOrgRepository();
5152
String githubRefName = getGithubRefName();
5253
String previousRefName = getPreviousRefName();
5354
String trainVersions = getTrainVersions();
@@ -79,20 +80,20 @@ void run() {
7980
}
8081
}
8182

82-
String getGithubRepository() {
83-
return System.getenv("GITHUB_REPOSITORY");
83+
String getGithubOrgRepository() {
84+
return Input.getGithubOrgRepository();
8485
}
8586

8687
String getPreviousRefName() {
87-
return System.getenv("PREVIOUS_REF_NAME");
88+
return Input.getPreviousRefName();
8889
}
8990

9091
String getGithubRefName() {
91-
return System.getenv("GITHUB_REF_NAME");
92+
return Input.getGithubRefName();
9293
}
9394

9495
String getTrainVersions() {
95-
return System.getenv("TRAIN_VERSIONS");
96+
return Input.getTrainVersions();
9697
}
9798

9899
ProjectTrainReleaseWorkflow trainReleaseWorkflow(String githubOrgRepo, String artifactToCheck,

‎src/main/java/io/micrometer/release/single/Dependency.java renamed to ‎src/main/java/io/micrometer/release/common/Dependency.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.micrometer.release.single;
16+
package io.micrometer.release.common;
1717

18-
record Dependency(String group, String artifact, String version, boolean toIgnore) {
18+
public record Dependency(String group, String artifact, String version, boolean toIgnore) {
1919

2020
}

‎src/main/java/io/micrometer/release/single/GradleParser.java renamed to ‎src/main/java/io/micrometer/release/common/GradleParser.java

Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,29 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.micrometer.release.single;
17-
18-
import io.micrometer.release.common.ProcessRunner;
19-
20-
import java.util.concurrent.atomic.AtomicReference;
16+
package io.micrometer.release.common;
2117

2218
import org.slf4j.Logger;
2319
import org.slf4j.LoggerFactory;
2420

25-
import java.util.ArrayList;
26-
import java.util.HashSet;
27-
import java.util.List;
28-
import java.util.Set;
21+
import java.util.*;
22+
import java.util.concurrent.ConcurrentHashMap;
2923

30-
class GradleParser {
24+
public class GradleParser {
3125

3226
private static final Logger log = LoggerFactory.getLogger(GradleParser.class);
3327

34-
private final List<String> excludedDependencyScopes = List.of("testCompile", "testImplementation", "checkstyle",
35-
"runtime", "nohttp", "testRuntime", "optional");
36-
37-
private final AtomicReference<Set<Dependency>> dependenciesCache = new AtomicReference<>();
28+
private final List<String> excludedDependencyScopes = List.of("testCompile",
29+
"testImplementation", "checkstyle",
30+
"runtime", "nohttp", "testRuntime", "optional");
3831

3932
private final ProcessRunner processRunner;
4033

41-
GradleParser(ProcessRunner processRunner) {
34+
public GradleParser(ProcessRunner processRunner) {
4235
this.processRunner = processRunner;
4336
}
4437

45-
Set<Dependency> fetchAllDependencies() {
46-
Set<Dependency> cachedDependencies = dependenciesCache.get();
47-
if (cachedDependencies != null) {
48-
log.info("Returned cached dependencies");
49-
return cachedDependencies;
50-
}
38+
public Set<Dependency> fetchAllDependencies() {
5139
log.info("Fetching test and optional dependencies...");
5240
List<String> projectLines = projectLines();
5341
List<String> subprojects = projectLines.stream()
@@ -72,36 +60,32 @@ Set<Dependency> fetchAllDependencies() {
7260
boolean finalTestOrOptional = testOrOptional;
7361
dependencies.stream()
7462
.filter(dependency -> dependency.group().equalsIgnoreCase(parts[1])
75-
&& dependency.artifact().equalsIgnoreCase(parts[2]))
63+
&& dependency.artifact().equalsIgnoreCase(parts[2]))
7664
.findFirst()
7765
.ifPresentOrElse(dependency -> {
78-
log.debug("Dependency {} is already present in compile scope", parts[1] + ":" + parts[2]);
66+
log.debug("Dependency {} is already present in compile scope",
67+
parts[1] + ":" + parts[2]);
7968
if (dependency.toIgnore() && !finalTestOrOptional) {
8069
log.debug(
81-
"Dependency {} was previously set in test or compile scope and will be in favour of one in compile scope",
82-
dependency);
70+
"Dependency {} was previously set in test or compile scope and will be in favour of one in compile scope",
71+
dependency);
8372
dependencies.remove(dependency);
84-
dependencies.add(new Dependency(parts[1], parts[2], version, finalTestOrOptional));
73+
dependencies.add(new Dependency(parts[1], parts[2], version,
74+
finalTestOrOptional));
8575
}
86-
}, () -> dependencies.add(new Dependency(parts[1], parts[2], version, finalTestOrOptional)));
87-
}
88-
else if (excludedDependencyScopes.stream()
76+
}, () -> dependencies.add(
77+
new Dependency(parts[1], parts[2], version, finalTestOrOptional)));
78+
} else if (excludedDependencyScopes.stream()
8979
.anyMatch(string -> line.toLowerCase().contains(string.toLowerCase()))) {
9080
testOrOptional = true;
91-
}
92-
else if (line.isEmpty() || line.isBlank()) {
81+
} else if (line.isEmpty() || line.isBlank()) {
9382
testOrOptional = false;
9483
}
9584
}
9685
}
97-
dependenciesCache.set(dependencies);
9886
return dependencies;
9987
}
10088

101-
void clearCache() {
102-
dependenciesCache.set(null);
103-
}
104-
10589
static String extractVersion(String line) {
10690
if (line == null || line.trim().isEmpty()) {
10791
return null;
@@ -123,11 +107,11 @@ static String extractVersion(String line) {
123107
return null;
124108
}
125109

126-
List<String> dependenciesLines(List<String> gradleCommand) {
110+
public List<String> dependenciesLines(List<String> gradleCommand) {
127111
return processRunner.runSilently(gradleCommand);
128112
}
129113

130-
List<String> projectLines() {
114+
public List<String> projectLines() {
131115
return processRunner.runSilently("./gradlew", "projects");
132116
}
133117

‎src/main/java/io/micrometer/release/common/Input.java

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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.common;
17+
18+
public class Input {
19+
20+
public static void assertInputs(String githubOrgRepo, String githubRefName,
21+
String previousRefName) {
22+
if (githubOrgRepo == null) {
23+
throw new IllegalStateException(
24+
"No repo found, please provide the GITHUB_REPOSITORY env variable");
25+
}
26+
if (githubRefName == null) {
27+
throw new IllegalStateException(
28+
"No github ref found, please provide the GITHUB_REF_NAME env variable");
29+
}
30+
if (!githubRefName.startsWith("v")) {
31+
throw new IllegalStateException(
32+
"Github ref must be a tag (must start with 'v'): " + githubRefName);
33+
}
34+
if (previousRefName != null && !previousRefName.isBlank() && !previousRefName.startsWith(
35+
"v")) {
36+
throw new IllegalStateException(
37+
"Previous github ref must be a tag (must start with 'v'): " + previousRefName);
38+
}
39+
}
40+
41+
public static String getGithubOrgRepository() {
42+
return System.getenv("GITHUB_REPOSITORY");
43+
}
44+
45+
public static String getPreviousRefName() {
46+
return System.getenv("PREVIOUS_REF_NAME");
47+
}
48+
49+
public static String getGithubRefName() {
50+
return System.getenv("GITHUB_REF_NAME");
51+
}
52+
53+
public static String getTrainVersions() {
54+
return System.getenv("TRAIN_VERSIONS");
55+
}
56+
}

‎src/main/java/io/micrometer/release/common/ProcessRunner.java

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
package io.micrometer.release.common;
1717

18-
import java.io.File;
19-
2018
import org.slf4j.Logger;
2119
import org.slf4j.LoggerFactory;
2220

2321
import java.io.BufferedReader;
22+
import java.io.File;
2423
import java.io.IOException;
2524
import java.io.InputStreamReader;
2625
import java.util.*;
@@ -33,14 +32,21 @@ public class ProcessRunner {
3332

3433
private final String repo;
3534

35+
private final File directory;
36+
3637
private final Map<String, String> envVars = new HashMap<>();
3738

3839
public ProcessRunner() {
39-
this.repo = null;
40+
this(null, null);
4041
}
4142

4243
public ProcessRunner(String repo) {
44+
this(repo, null);
45+
}
46+
47+
public ProcessRunner(String repo, File directory) {
4348
this.repo = repo;
49+
this.directory = directory;
4450
}
4551

4652
public ProcessRunner withEnvVars(Map<String, String> envVars) {
@@ -78,29 +84,29 @@ private List<String> run(boolean shouldLog, String... command) {
7884
List<String> errorLines = new ArrayList<>();
7985

8086
Thread outputThread = new Thread(() -> {
81-
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
87+
try (BufferedReader reader = new BufferedReader(
88+
new InputStreamReader(process.getInputStream()))) {
8289
String line;
8390
while ((line = reader.readLine()) != null) {
8491
if (shouldLog) {
8592
log(line);
8693
}
8794
lines.add(line);
8895
}
89-
}
90-
catch (IOException e) {
96+
} catch (IOException e) {
9197
log.error("Error reading process output", e);
9298
}
9399
});
94100

95101
Thread errorThread = new Thread(() -> {
96-
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
102+
try (BufferedReader reader = new BufferedReader(
103+
new InputStreamReader(process.getErrorStream()))) {
97104
String line;
98105
while ((line = reader.readLine()) != null) {
99106
log.error(line);
100107
errorLines.add(line);
101108
}
102-
}
103-
catch (IOException e) {
109+
} catch (IOException e) {
104110
log.error("Error reading process error stream", e);
105111
}
106112
});
@@ -114,12 +120,12 @@ private List<String> run(boolean shouldLog, String... command) {
114120

115121
int exitCode = process.waitFor();
116122
if (exitCode != 0) {
117-
String errorMessage = String.format("Failed to run the command %s. Exit code: %d.%nError output:%n%s",
118-
Arrays.toString(processedCommand), exitCode, String.join("\n", errorLines));
123+
String errorMessage = String.format(
124+
"Failed to run the command %s. Exit code: %d.%nError output:%n%s",
125+
Arrays.toString(processedCommand), exitCode, String.join("\n", errorLines));
119126
throw new IllegalStateException(errorMessage);
120127
}
121-
}
122-
catch (IOException | InterruptedException e) {
128+
} catch (IOException | InterruptedException e) {
123129
throw new IllegalStateException("A failure around the process execution happened", e);
124130
}
125131
log.info("Command executed successfully");
@@ -132,7 +138,11 @@ void log(String logLine) {
132138

133139
Process startProcess(String... processedCommand) throws IOException, InterruptedException {
134140
runGitConfig();
135-
ProcessBuilder processBuilder = new ProcessBuilder(processedCommand).redirectErrorStream(false);
141+
ProcessBuilder processBuilder = new ProcessBuilder(processedCommand).redirectErrorStream(
142+
false);
143+
if (directory != null) {
144+
processBuilder.directory(directory);
145+
}
136146
return doStartProcess(processBuilder);
137147
}
138148

@@ -146,14 +156,15 @@ Process doStartProcess(ProcessBuilder processBuilder) throws IOException {
146156
}
147157

148158
void runGitConfig() throws InterruptedException, IOException {
149-
doStartProcess(new ProcessBuilder("git", "config", "--global", "--add", "safe.directory", "/github/workspace"))
159+
doStartProcess(new ProcessBuilder("git", "config", "--global", "--add", "safe.directory",
160+
"/github/workspace"))
150161
.waitFor();
151162
}
152163

153164
private String[] processCommand(String[] command) {
154165
String[] processedCommand = command;
155166
if (repo != null && command.length > 2 && command[0].equalsIgnoreCase("gh")
156-
&& !command[1].equalsIgnoreCase("api")) {
167+
&& !command[1].equalsIgnoreCase("api")) {
157168
List<String> commands = new LinkedList<>(Arrays.stream(command).toList());
158169
commands.add("--repo");
159170
commands.add(repo);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package io.micrometer.release.single;
1717

18+
import io.micrometer.release.common.Dependency;
19+
import io.micrometer.release.common.GradleParser;
1820
import io.micrometer.release.common.ProcessRunner;
1921
import io.micrometer.release.single.ChangelogSection.Section;
2022
import org.slf4j.Logger;

0 commit comments

Comments
 (0)