MID-8842 ninja, dist upgrade improvements + more logging

Evolveum · Jun 23, 2023 · 28685fc · 28685fc
1 parent d0660ae
commit 28685fc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/ninja/action/upgrade/DownloadDistributionAction.java b/.../src/main/java/com/evolveum/midpoint/ninja/action/upgrade/DownloadDistributionAction.java
@@ -24,10 +24,13 @@ public DownloadDistributionResult execute() throws Exception {
 
         File distributionZipFile = options.getDistributionArchive();
         if (distributionZipFile == null || !distributionZipFile.exists()) {
+            String version = UpgradeConstants.SUPPORTED_VERSION_TARGET;
+            log.info("Downloading distribution: {}", version);
+
             DistributionManager manager = new DistributionManager(tempDirectory);
             ProgressListener listener = new ConsoleProgressListener(context.out);
 
-            distributionZipFile = manager.downloadDistribution(UpgradeConstants.SUPPORTED_VERSION_TARGET, listener);
+            distributionZipFile = manager.downloadDistribution(version, listener);
         } else {
             log.info("Distribution zip already downloaded.");
         }

diff --git a/...a/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeDistributionAction.java b/...a/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeDistributionAction.java
@@ -8,7 +8,6 @@
 import com.evolveum.midpoint.ninja.action.Action;
 import com.evolveum.midpoint.ninja.action.RunSqlAction;
 import com.evolveum.midpoint.ninja.action.RunSqlOptions;
-import com.evolveum.midpoint.ninja.util.NinjaUtils;
 
 public class UpgradeDistributionAction extends Action<UpgradeDistributionOptions, Void> {
 
@@ -28,12 +27,13 @@ public Void execute() throws Exception {
         downloadAction.init(context, downloadOpts);
         DownloadDistributionResult downloadResult = downloadAction.execute();
 
-        // todo next actions should be executed from downloaded ninja (as not to replace ninja.jar that's currently running), or maybe not?
-//        log.info("Starting ninja");
-//        new ProcessBuilder(
-//                "../../_mess/mid8842/.upgrade-process/1685390031006-midpoint-latest-dist/bin/ninja.sh -v --offline -h".split(" ")
-//        ).inheritIO().start();
-//        context.out.println("Finished main");
+        File distributionDirectory = downloadResult.getDistributionDirectory();
+
+        // upgrade repository
+        runUpgradeSql(RunSqlOptions.Mode.REPOSITORY, distributionDirectory);
+
+        // upgrade audit
+        runUpgradeSql(RunSqlOptions.Mode.AUDIT, distributionDirectory);
 
         // upgrade installation
         UpgradeInstallationOptions installationOpts = new UpgradeInstallationOptions();
@@ -45,31 +45,19 @@ public Void execute() throws Exception {
         installationAction.init(context, installationOpts);
         installationAction.execute();
 
-        File installationDirectory = NinjaUtils.computeInstallationDirectory(options.getInstallationDirectory(), context);
-
-        // upgrade repository
-        RunSqlOptions upgradeRepositoryOpts = new RunSqlOptions();
-        upgradeRepositoryOpts.setUpgrade(true);
-        upgradeRepositoryOpts.setMode(RunSqlOptions.Mode.REPOSITORY);
-        upgradeRepositoryOpts.setScripts(RunSqlOptions.Mode.REPOSITORY.updateScripts.stream()
-                .map(f -> new File(installationDirectory, f.getPath()))
-                .collect(Collectors.toList()));
-
-        RunSqlAction upgradeRepositoryAction = new RunSqlAction();
-        upgradeRepositoryAction.init(context, upgradeRepositoryOpts);
-        upgradeRepositoryAction.execute();
+        return null;
+    }
 
-        RunSqlOptions upgradeAuditOpts = new RunSqlOptions();
-        upgradeAuditOpts.setUpgrade(true);
-        upgradeAuditOpts.setMode(RunSqlOptions.Mode.AUDIT);
-        upgradeRepositoryOpts.setScripts(RunSqlOptions.Mode.AUDIT.updateScripts.stream()
-                .map(f -> new File(installationDirectory, f.getPath()))
+    private void runUpgradeSql(RunSqlOptions.Mode mode, File distributionDirectory) throws Exception {
+        RunSqlOptions runSqlOptions = new RunSqlOptions();
+        runSqlOptions.setUpgrade(true);
+        runSqlOptions.setMode(mode);
+        runSqlOptions.setScripts(mode.updateScripts.stream()
+                .map(f -> new File(distributionDirectory, f.getPath()))
                 .collect(Collectors.toList()));
 
-        RunSqlAction upgradeAuditAction = new RunSqlAction();
-        upgradeAuditAction.init(context, upgradeAuditOpts);
-        upgradeAuditAction.execute();
-
-        return null;
+        RunSqlAction action = new RunSqlAction();
+        action.init(context, runSqlOptions);
+        action.execute();
     }
 }
diff --git a/...a/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeInstallationAction.java b/...a/src/main/java/com/evolveum/midpoint/ninja/action/upgrade/UpgradeInstallationAction.java
@@ -8,12 +8,16 @@
 import com.evolveum.midpoint.ninja.action.Action;
 import com.evolveum.midpoint.ninja.util.NinjaUtils;
 
+import org.fusesource.jansi.Ansi;
+
 public class UpgradeInstallationAction extends Action<UpgradeInstallationOptions, Void> {
 
     private static final String VAR_DIRECTORY = "var";
 
     @Override
     public Void execute() throws Exception {
+        log.info(Ansi.ansi().fgGreen().a("Upgrading installation").toString());
+
         final File distributionDirectory = options.getDistributionDirectory();
 
         final boolean backupFiles = options.isBackup();
@@ -54,6 +58,8 @@ public Void execute() throws Exception {
             }
         }
 
+        log.info("");
+
         return null;
     }