Skip to content

Commit

Permalink
Add new update version gradle task (#103335)
Browse files Browse the repository at this point in the history
Add an updateVersions gradle task that updates the version numbers in the ES repo as part of release automation. This will be used by the release automation tools, replacing old functionality to manually modify the java files.
  • Loading branch information
thecoop committed Jan 17, 2024
1 parent dfcf6fc commit 840bb2a
Show file tree
Hide file tree
Showing 4 changed files with 464 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build-tools-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ dependencies {
compileOnly buildLibs.checkstyle
compileOnly buildLibs.reflections

implementation 'com.github.javaparser:javaparser-core:3.18.0'

runtimeOnly "org.elasticsearch.gradle:reaper:$version"
testImplementation buildLibs.checkstyle
testImplementation buildLibs.wiremock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public void apply(Project project) {

final Version version = VersionProperties.getElasticsearchVersion();

project.getTasks()
.register("updateVersions", UpdateVersionsTask.class, t -> project.getTasks().named("spotlessApply").get().mustRunAfter(t));

final FileTree yamlFiles = projectDirectory.dir("docs/changelog")
.getAsFileTree()
.matching(new PatternSet().include("**/*.yml", "**/*.yaml"));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

package org.elasticsearch.gradle.internal.release;

import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.NodeList;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.FieldDeclaration;
import com.github.javaparser.ast.body.VariableDeclarator;
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter;
import com.google.common.annotations.VisibleForTesting;

import org.elasticsearch.gradle.Version;
import org.gradle.api.DefaultTask;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
import org.gradle.api.tasks.TaskAction;
import org.gradle.api.tasks.options.Option;
import org.gradle.initialization.layout.BuildLayout;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Map;
import java.util.NavigableMap;
import java.util.Objects;
import java.util.Optional;
import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import javax.annotation.Nullable;
import javax.inject.Inject;

public class UpdateVersionsTask extends DefaultTask {
private static final Logger LOGGER = Logging.getLogger(UpdateVersionsTask.class);

static final String SERVER_MODULE_PATH = "server/src/main/java/";
static final String VERSION_FILE_PATH = SERVER_MODULE_PATH + "org/elasticsearch/Version.java";

static final Pattern VERSION_FIELD = Pattern.compile("V_(\\d+)_(\\d+)_(\\d+)(?:_(\\w+))?");

final Path rootDir;

@Nullable
private Version addVersion;
private boolean setCurrent;
@Nullable
private Version removeVersion;

@Inject
public UpdateVersionsTask(BuildLayout layout) {
rootDir = layout.getRootDirectory().toPath();
}

@Option(option = "add-version", description = "Specifies the version to add")
public void addVersion(String version) {
this.addVersion = Version.fromString(version);
}

@Option(option = "set-current", description = "Set the 'current' constant to the new version")
public void setCurrent(boolean setCurrent) {
this.setCurrent = setCurrent;
}

@Option(option = "remove-version", description = "Specifies the version to remove")
public void removeVersion(String version) {
this.removeVersion = Version.fromString(version);
}

static String toVersionField(Version version) {
return String.format("V_%d_%d_%d", version.getMajor(), version.getMinor(), version.getRevision());
}

static Optional<Version> parseVersionField(CharSequence field) {
Matcher m = VERSION_FIELD.matcher(field);
if (m.find() == false) return Optional.empty();

return Optional.of(
new Version(Integer.parseInt(m.group(1)), Integer.parseInt(m.group(2)), Integer.parseInt(m.group(3)), m.group(4))
);
}

@TaskAction
public void executeTask() throws IOException {
if (addVersion == null && removeVersion == null) {
throw new IllegalArgumentException("No versions to add or remove specified");
}
if (setCurrent && addVersion == null) {
throw new IllegalArgumentException("No new version added to set as the current version");
}
if (Objects.equals(addVersion, removeVersion)) {
throw new IllegalArgumentException("Same version specified to add and remove");
}

Path versionJava = rootDir.resolve(VERSION_FILE_PATH);
CompilationUnit file = LexicalPreservingPrinter.setup(StaticJavaParser.parse(versionJava));

Optional<CompilationUnit> modifiedFile = Optional.empty();
if (addVersion != null) {
LOGGER.lifecycle("Adding new version [{}] to [{}]", addVersion, versionJava);
var added = addVersionConstant(modifiedFile.orElse(file), addVersion, setCurrent);
if (added.isPresent()) {
modifiedFile = added;
}
}
if (removeVersion != null) {
LOGGER.lifecycle("Removing version [{}] from [{}]", removeVersion, versionJava);
var removed = removeVersionConstant(modifiedFile.orElse(file), removeVersion);
if (removed.isPresent()) {
modifiedFile = removed;
}
}

if (modifiedFile.isPresent()) {
writeOutNewContents(versionJava, modifiedFile.get());
}
}

@VisibleForTesting
static Optional<CompilationUnit> addVersionConstant(CompilationUnit versionJava, Version version, boolean updateCurrent) {
String newFieldName = toVersionField(version);

ClassOrInterfaceDeclaration versionClass = versionJava.getClassByName("Version").get();
if (versionClass.getFieldByName(newFieldName).isPresent()) {
LOGGER.lifecycle("New version constant [{}] already present, skipping", newFieldName);
return Optional.empty();
}

NavigableMap<Version, FieldDeclaration> versions = versionClass.getFields()
.stream()
.map(f -> Map.entry(f, parseVersionField(f.getVariable(0).getNameAsString())))
.filter(e -> e.getValue().isPresent())
.collect(Collectors.toMap(e -> e.getValue().get(), Map.Entry::getKey, (v1, v2) -> {
throw new IllegalArgumentException("Duplicate version constants " + v1);
}, TreeMap::new));

// find the version this should be inserted after
var previousVersion = versions.lowerEntry(version);
if (previousVersion == null) {
throw new IllegalStateException(String.format("Could not find previous version to [%s]", version));
}
FieldDeclaration newVersion = createNewVersionConstant(
previousVersion.getValue(),
newFieldName,
String.format("%d_%02d_%02d_99", version.getMajor(), version.getMinor(), version.getRevision())
);
versionClass.getMembers().addAfter(newVersion, previousVersion.getValue());

if (updateCurrent) {
versionClass.getFieldByName("CURRENT")
.orElseThrow(() -> new IllegalArgumentException("Could not find CURRENT constant"))
.getVariable(0)
.setInitializer(new NameExpr(newFieldName));
}

return Optional.of(versionJava);
}

private static FieldDeclaration createNewVersionConstant(FieldDeclaration lastVersion, String newName, String newExpr) {
return new FieldDeclaration(
new NodeList<>(lastVersion.getModifiers()),
new VariableDeclarator(
lastVersion.getCommonType(),
newName,
StaticJavaParser.parseExpression(String.format("new Version(%s)", newExpr))
)
);
}

@VisibleForTesting
static Optional<CompilationUnit> removeVersionConstant(CompilationUnit versionJava, Version version) {
String removeFieldName = toVersionField(version);

ClassOrInterfaceDeclaration versionClass = versionJava.getClassByName("Version").get();
var declaration = versionClass.getFieldByName(removeFieldName);
if (declaration.isEmpty()) {
LOGGER.lifecycle("Version constant [{}] not found, skipping", removeFieldName);
return Optional.empty();
}

// check if this is referenced by CURRENT
String currentReference = versionClass.getFieldByName("CURRENT")
.orElseThrow(() -> new IllegalArgumentException("Could not find CURRENT constant"))
.getVariable(0)
.getInitializer()
.get()
.asNameExpr()
.getNameAsString();
if (currentReference.equals(removeFieldName)) {
throw new IllegalArgumentException(String.format("Cannot remove version [%s], it is referenced by CURRENT", version));
}

declaration.get().remove();

return Optional.of(versionJava);
}

static void writeOutNewContents(Path file, CompilationUnit unit) throws IOException {
if (unit.containsData(LexicalPreservingPrinter.NODE_TEXT_DATA) == false) {
throw new IllegalArgumentException("CompilationUnit has no lexical information for output");
}
Files.writeString(file, LexicalPreservingPrinter.print(unit), StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
}
}

0 comments on commit 840bb2a

Please sign in to comment.