MID-8842 upgrade, fixed tests after shadow audit merge to master

Evolveum · Jun 16, 2023 · 99cb61a · 99cb61a
1 parent b12786f
commit 99cb61a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ListKeysRepositoryAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/ListKeysRepositoryAction.java
@@ -6,24 +6,24 @@
  */
 package com.evolveum.midpoint.ninja.action;
 
+import java.security.*;
+import java.security.cert.Certificate;
+import java.util.Enumeration;
+import javax.crypto.SecretKey;
+
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.context.ApplicationContext;
+
 import com.evolveum.midpoint.ninja.impl.LogTarget;
 import com.evolveum.midpoint.ninja.impl.NinjaException;
 import com.evolveum.midpoint.prism.crypto.EncryptionException;
 import com.evolveum.midpoint.prism.crypto.KeyStoreBasedProtector;
 import com.evolveum.midpoint.prism.crypto.Protector;
 
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.context.ApplicationContext;
-
-import javax.crypto.SecretKey;
-import java.security.*;
-import java.security.cert.Certificate;
-import java.util.Enumeration;
-
 /**
  * Created by Viliam Repan (lazyman).
  */
-public class ListKeysRepositoryAction extends RepositoryAction<ListKeysOptions, Void> {
+public class ListKeysRepositoryAction extends Action<ListKeysOptions, Void> {
 
     private static final String KEY_DIGEST_TYPE = "SHA1";
 
@@ -34,6 +34,10 @@ public LogTarget getInfoLogTarget() {
 
     @Override
     public Void execute() throws Exception {
+        ConnectionOptions connectionOptions = context.getOptions(ConnectionOptions.class);
+        // force offline mode, this action just reads keystore
+        connectionOptions.setOffline(true);
+
         ApplicationContext appContext = context.getApplicationContext();
         Protector protector = appContext.getBean(Protector.class);
 

diff --git a/tools/ninja/src/main/resources/messages.properties b/tools/ninja/src/main/resources/messages.properties
@@ -105,3 +105,5 @@ upgradeInstallation=Upgrade installation
 upgradeInstallation.distributionDirectory=Distribution directory path
 upgradeInstallation.backupInstallationDirectory=Backup installation directory
 upgradeInstallation.installationDirectory=Installation directory path
+verifyFiles=Verify files
+verifyFiles.files=Files/Directories for verification.
diff --git a/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/SetupDatabaseTest.java b/tools/ninja/src/test/java/com/evolveum/midpoint/ninja/upgrade/SetupDatabaseTest.java
@@ -48,6 +48,6 @@ public void test100InitializeDatabase() throws Exception {
         Assertions.assertThat(getGlobalMetadataValue(ninjaTestDatabase, "schemaChangeNumber"))
                 .isEqualTo("15");
         Assertions.assertThat(getGlobalMetadataValue(ninjaTestDatabase, "schemaAuditChangeNumber"))
-                .isEqualTo("3");
+                .isEqualTo("4");
     }
 }