Skip to content

refactor(ci): remove unused split-repository logic from release notes generator #13685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jinseopkim0 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor(ci): remove unused split-repository logic from release notes generator #13685

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d501ab7
refactor(ci): remove unused split-repository logic from release notes…
jinseopkim0 Jul 7, 2026
b410b84
refactor(ci): address review feedback to hoist releaseUrl and clean u…
jinseopkim0 Jul 7, 2026
3cf7093
refactor(ci): use Guava's ImmutableList.Builder to build and join rel…
jinseopkim0 Jul 7, 2026
67a3818
Merge branch 'main' into jinseop/cleanup-split-repo-logic
jinseopkim0 Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 6 additions & 88 deletions ...oud-bom/release-note-generation/src/main/java/com/google/cloud/ReleaseNoteGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud;

import static com.google.common.collect.ImmutableList.toImmutableList;

import com.google.cloud.tools.opensource.dependencies.Artifacts;
import com.google.cloud.tools.opensource.dependencies.Bom;
import com.google.cloud.tools.opensource.dependencies.MavenRepositoryException;
Expand All @@ -27,22 +25,18 @@
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.base.Verify;
import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
import com.google.common.collect.Streams;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand All @@ -62,8 +56,6 @@ public class ReleaseNoteGeneration {
private static final String RELEASE_NOTE_FILE_NAME = "release_note.md";
private static final String GOOGLEAPIS_ORG = "googleapis";

private static final ImmutableSet<String> splitRepositoryLibraryNames = ImmutableSet.of();

private static boolean clientLibraryFilter(String coordinates) {
if (coordinates.contains("google-cloud-core")) {
// Google Cloud Core is reported in core Google library section as this is not meant to be
Expand Down Expand Up @@ -304,11 +296,7 @@ private void reportCloudClientBomDifference(Bom oldBom, Bom newBom, String googl
}

report.append("# Notable Changes\n\n");
reportClientLibrariesNotableChangeLogs(
minorVersionBumpVersionlessCoordinates,
versionlessCoordinatesToVersionOld,
versionlessCoordinatesToVersionNew,
googleCloudJavaVersion);
reportClientLibrariesNotableChangeLogs(googleCloudJavaVersion);

report.append("# Version Upgrades\n\n");
if (!majorVersionBumpVersionlessCoordinates.isEmpty()) {
Expand Down Expand Up @@ -393,37 +381,18 @@ void reportClientLibraryVersionDifference(
ImmutableList<String> versionsForReleaseNotes =
clientLibraryReleaseNoteVersions(versionlessCoordinates, previousVersion, currentVersion);

String libraryName = null;
if (artifactId.contains("google-cloud-")) {
libraryName = artifactId.replace("google-cloud-", "");
} else if (artifactId.contains("google-")) {
// Case of google-iam-admin
libraryName = artifactId.replace("google-", "");
}

List<String> links = new ArrayList<>();
String releaseUrl = releaseUrlForMonorepo(googleCloudJavaVersion);
ImmutableList.Builder<String> links = ImmutableList.builder();
for (String versionForReleaseNotes : versionsForReleaseNotes) {
String[] versionAndQualifier = versionForReleaseNotes.split("-");
String version = versionAndQualifier[0];
String releaseUrl =
splitRepositoryLibraryNames.contains(libraryName)
? releaseUrlForSplitRepo(libraryName, version)
: releaseUrlForMonorepo(libraryName, googleCloudJavaVersion);
links.add(String.format("[v%s](%s)", versionForReleaseNotes, releaseUrl));
}
Comment thread
jinseopkim0 marked this conversation as resolved.
line.append(Joiner.on(", ").join(links)).append(")");
line.append(Joiner.on(", ").join(links.build())).append(")");

report.append(line).append("\n");
}
}

private static String releaseUrlForSplitRepo(String libraryName, String version) {
return String.format(
"https://github.com/googleapis/java-%s/releases/tag/v%s", libraryName, version);
}

private static String releaseUrlForMonorepo(String libraryName, String version) {
// libraryName is unused for the monorepo release note as of Dec 2022
private static String releaseUrlForMonorepo(String version) {
return String.format(
"https://github.com/googleapis/google-cloud-java/releases/tag/v%s", version);
}
Expand Down Expand Up @@ -498,59 +467,8 @@ static boolean isPatchVersionBump(String previousVersion, String currentVersion)
* in between the two versions, not including the old version.
*/
@VisibleForTesting
void reportClientLibrariesNotableChangeLogs(
Iterable<String> artifactsInBothBoms,
Map<String, String> versionlessCoordinatesToVersionOld,
Map<String, String> versionlessCoordinatesToVersionNew,
String googleCloudJavaVersion)
void reportClientLibrariesNotableChangeLogs(String googleCloudJavaVersion)
throws IOException, InterruptedException {

ImmutableList<String> sortedVersionlessCoordinates =
Streams.stream(artifactsInBothBoms).sorted().collect(toImmutableList());

for (String versionlessCoordinates : sortedVersionlessCoordinates) {
List<String> coordinates = Splitter.on(":").splitToList(versionlessCoordinates);
String artifactId = coordinates.get(1);
String previousVersion = versionlessCoordinatesToVersionOld.get(versionlessCoordinates);
String currentVersion = versionlessCoordinatesToVersionNew.get(versionlessCoordinates);
Optional<String> matchingSplitRepoName =
splitRepositoryLibraryNames.stream()
.map(libraryName -> artifactId.endsWith(libraryName) ? "java-" + libraryName : null)
.filter(Objects::nonNull)
.findFirst();
matchingSplitRepoName.ifPresent(
splitRepoName -> {
try {
ImmutableList<String> versionsForReleaseNotes =
clientLibraryReleaseNoteVersions(
versionlessCoordinates, previousVersion, currentVersion);
String changelog =
fetchClientLibraryNotableChangeLog(splitRepoName, versionsForReleaseNotes);
if (!changelog.isEmpty()) {
// Only print library name when there are notable changes
report
.append("## ")
.append(artifactId)
.append(" ")
.append(currentVersion)
.append(" (prev: ")
.append(previousVersion)
.append(")");
report.append(changelog).append("\n");
}
} catch (MavenRepositoryException | IOException | InterruptedException ex) {
throw new VerifyException(
"Couldn't write notable changelog for "
+ versionlessCoordinates
+ "'s versions between "
+ previousVersion
+ " and "
+ currentVersion,
ex);
}
});
}

report.append("## Other libraries\n\n");
String changelog =
fetchClientLibraryNotableChangeLog(
Expand Down
Loading