Merge pull request #582 from yersan/issue-580-main

[580] Add the --rm option to the SPI apply update and revert commands
wildfly-extras · Mar 5, 2024 · 26cb039 · 26cb039
2 parents 994cc09 + 367ed5b
commit 26cb039
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...n-tests/src/test/java/org/wildfly/prospero/it/installationmanager/CreateSnapshotTest.java b/...n-tests/src/test/java/org/wildfly/prospero/it/installationmanager/CreateSnapshotTest.java
@@ -84,6 +84,8 @@ public void generateApplyCommand() throws Exception {
         expected.append(CliConstants.CANDIDATE_DIR).append(" \"").append(Path.of("foo").toAbsolutePath()).append("\"");
         expected.append(" ");
         expected.append(CliConstants.YES);
+        expected.append(" ");
+        expected.append(CliConstants.REMOVE);
 
         final ProvisioningDefinition provisioningDefinition = defaultWfCoreDefinition()
                 .setChannelCoordinates(channelsFile.toString())
@@ -115,6 +117,8 @@ public void generateApplyCommandWithOsShell() throws Exception {
         expected.append(CliConstants.CANDIDATE_DIR).append(" \"").append(Path.of("foo").toAbsolutePath()).append("\"");
         expected.append(" ");
         expected.append(CliConstants.YES);
+        expected.append(" ");
+        expected.append(CliConstants.REMOVE);
 
         final ProvisioningDefinition provisioningDefinition = defaultWfCoreDefinition()
                 .setChannelCoordinates(channelsFile.toString())

diff --git a/prospero-cli/src/main/java/org/wildfly/prospero/cli/spi/CliProviderImpl.java b/prospero-cli/src/main/java/org/wildfly/prospero/cli/spi/CliProviderImpl.java
@@ -53,15 +53,17 @@ public String getApplyUpdateCommand(Path installationPath, Path candidatePath) {
         return CliConstants.Commands.UPDATE + " " + CliConstants.Commands.APPLY + " "
                 + CliConstants.DIR + " " + escape(installationPath.toAbsolutePath()) + " "
                 + CliConstants.CANDIDATE_DIR + " " + escape(candidatePath.toAbsolutePath()) + " "
-                + CliConstants.YES;
+                + CliConstants.YES + " "
+                + CliConstants.REMOVE;
     }
 
     @Override
     public String getApplyRevertCommand(Path installationPath, Path candidatePath) {
         return CliConstants.Commands.REVERT + " " + CliConstants.Commands.APPLY + " "
                 + CliConstants.DIR + " " + escape(installationPath.toAbsolutePath()) + " "
                 + CliConstants.CANDIDATE_DIR + " " + escape(candidatePath.toAbsolutePath()) + " "
-                + CliConstants.YES;
+                + CliConstants.YES + " "
+                + CliConstants.REMOVE;
     }
 
     private String escape(Path absolutePath) {