From 83e7704b8edcaee8bd5b3fb2deaf8c8347480097 Mon Sep 17 00:00:00 2001 From: Parul Sharma Date: Mon, 23 Sep 2024 13:50:58 +0530 Subject: [PATCH] Draft:Update process should check version and not allow reversion through update #759 --- .../prospero/cli/commands/UpdateCommand.java | 49 ++++++++++++++++--- .../prospero/actions/UpdateAction.java | 15 ++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/UpdateCommand.java b/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/UpdateCommand.java index d1cdc898e..32d063ef8 100644 --- a/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/UpdateCommand.java +++ b/prospero-cli/src/main/java/org/wildfly/prospero/cli/commands/UpdateCommand.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; import org.apache.commons.io.FileUtils; +import org.eclipse.aether.artifact.Artifact; import org.jboss.galleon.ProvisioningException; import org.jboss.galleon.diff.FsDiff; import org.jboss.galleon.diff.FsEntry; @@ -39,6 +40,7 @@ import org.wildfly.channel.ChannelManifest; import org.wildfly.channel.ChannelManifestCoordinate; import org.wildfly.channel.Repository; +import org.wildfly.channel.version.VersionMatcher; import org.wildfly.prospero.ProsperoLogger; import org.wildfly.prospero.actions.ApplyCandidateAction; import org.wildfly.prospero.actions.SubscribeNewServerAction; @@ -60,6 +62,7 @@ import org.wildfly.prospero.api.TemporaryFilesManager; import org.wildfly.prospero.galleon.FeaturePackLocationParser; import org.wildfly.prospero.galleon.GalleonUtils; +import org.wildfly.prospero.metadata.ManifestVersionRecord; import org.wildfly.prospero.metadata.ProsperoMetadataUtils; import org.wildfly.prospero.model.InstallationProfile; import org.wildfly.prospero.updates.UpdateSet; @@ -117,7 +120,6 @@ public Integer call() throws Exception { log.tracef("Perform full update"); console.println(CliMessages.MESSAGES.updateHeader(installationDir)); - try (UpdateAction updateAction = actionFactory.update(installationDir, mavenOptions, console, repositories)) { performUpdate(updateAction, yes, console, installationDir); } @@ -133,6 +135,11 @@ private boolean performUpdate(UpdateAction updateAction, boolean yes, CliConsole Path targetDir = null; try { targetDir = Files.createTempDirectory("update-candidate"); + InstallationMetadata installationMetadata = InstallationMetadata.loadInstallation(installDir); + List mavenManifests = installationMetadata.getManifestVersions().get().getMavenManifests(); + final List manifestUpdates = updateAction.findCurrentChannelSessionManifests(); + compareManifests(mavenManifests,manifestUpdates); + if (buildUpdate(updateAction, targetDir, yes, console, () -> console.confirmUpdates())) { console.println(""); console.buildUpdatesComplete(); @@ -422,17 +429,17 @@ private FeaturePackLocation getFpl(InstallationProfile knownFeaturePack, String public UpdateCommand(CliConsole console, ActionFactory actionFactory) { super(console, actionFactory, CliConstants.Commands.UPDATE, List.of( - new UpdateCommand.PrepareCommand(console, actionFactory), - new UpdateCommand.ApplyCommand(console, actionFactory), - new UpdateCommand.PerformCommand(console, actionFactory), - new UpdateCommand.ListCommand(console, actionFactory), + new PrepareCommand(console, actionFactory), + new ApplyCommand(console, actionFactory), + new PerformCommand(console, actionFactory), + new ListCommand(console, actionFactory), new SubscribeCommand(console, actionFactory)) ); + } private static boolean buildUpdate(UpdateAction updateAction, Path updateDirectory, boolean yes, CliConsole console, Supplier confirmation) throws OperationException, ProvisioningException { final UpdateSet updateSet = updateAction.findUpdates(); - console.updatesFound(updateSet.getArtifactUpdates()); if (updateSet.isEmpty()) { return false; @@ -471,4 +478,34 @@ public static Path detectProsperoInstallationPath() throws ArgumentParsingExcept return Paths.get(modulePath).toAbsolutePath().getParent(); } + + public static void compareManifests(List mavenManifests, List manifestUpdates ) { + + for (ManifestVersionRecord.MavenManifest installedManifest : mavenManifests) { + Artifact updateArtifact = null; + + // Find the corresponding update artifact for the installedManifest + for (Artifact manifestUpdate : manifestUpdates) { + if (manifestUpdate.getGroupId().equals(installedManifest.getGroupId()) && + manifestUpdate.getArtifactId().equals(installedManifest.getArtifactId())) { + updateArtifact = manifestUpdate; + break; + } + } + + if (updateArtifact != null) { + // Compare versions + String installedVersion = installedManifest.getVersion(); + String availableVersion = updateArtifact.getVersion(); + if (VersionMatcher.COMPARATOR.compare(installedVersion, availableVersion) < 0) { + System.out.println("Upgrade available for " + installedManifest.getArtifactId() + ": " + installedVersion + " -> " + availableVersion); + } else if (VersionMatcher.COMPARATOR.compare(installedVersion, availableVersion) > 0) { + System.out.println("Downgrade detected for " + installedManifest.getArtifactId() + ": " + installedVersion + " -> " + availableVersion); + } else { + System.out.println(installedManifest.getArtifactId() + " is up to date."); + } + } + } + } + } diff --git a/prospero-common/src/main/java/org/wildfly/prospero/actions/UpdateAction.java b/prospero-common/src/main/java/org/wildfly/prospero/actions/UpdateAction.java index 7b1e5c4c1..4dc4bc9a4 100644 --- a/prospero-common/src/main/java/org/wildfly/prospero/actions/UpdateAction.java +++ b/prospero-common/src/main/java/org/wildfly/prospero/actions/UpdateAction.java @@ -22,9 +22,13 @@ import java.nio.file.Path; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import org.apache.commons.io.FileUtils; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.jboss.galleon.util.PathsUtils; +import org.wildfly.channel.ChannelSession; import org.wildfly.channel.Channel; import org.wildfly.channel.Repository; import org.wildfly.prospero.ProsperoLogger; @@ -171,4 +175,15 @@ private ProsperoConfig addTemporaryRepositories(List repositories) { return new ProsperoConfig(channels, prosperoConfig.getMavenOptions()); } + + public List findCurrentChannelSessionManifests() throws ProvisioningException, OperationException { + try (GalleonEnvironment galleonEnv = getGalleonEnv(installDir); + ChannelSession channelSession = galleonEnv.getChannelSession()) { + + return channelSession.getRuntimeChannels().stream() + .map(runtimeChannel -> runtimeChannel.getChannelDefinition().getManifestCoordinate()) + .map(coordinate -> new DefaultArtifact(coordinate.getGroupId(), coordinate.getArtifactId(), coordinate.getExtension(), coordinate.getVersion())) + .collect(Collectors.toList()); + } + } }