handle expectedErrors in test-data

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/validators/HsDomainDnsSetupHostingAssetValidator.java

@@ -15,7 +15,8 @@ import static net.hostsharing.hsadminng.hs.validation.BooleanProperty.booleanPro
 import static net.hostsharing.hsadminng.hs.validation.IntegerProperty.integerProperty;
 import static net.hostsharing.hsadminng.hs.validation.StringProperty.stringProperty;
 
-class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator {
+// TODO.impl: make package private once we've migrated the legacy data
+public class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator {
 
     // according to  RFC 1035 (section 5) and RFC 1034
     static final String RR_REGEX_NAME = "(\\*\\.)?([a-zA-Z0-9\\._-]+|@)[ \t]+";
@@ -32,6 +33,8 @@ class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator
             RR_REGEX_NAME  + RR_REGEX_IN + RR_REGEX_TTL + RR_RECORD_TYPE + RR_RECORD_DATA + RR_COMMENT;
     public static final String IDENTIFIER_SUFFIX = "|DNS";
 
+    private static List<String> zoneFileErrors = null; // TODO.impl: remove once legacy data is migrated
+
     HsDomainDnsSetupHostingAssetValidator() {
         super(
                 DOMAIN_DNS_SETUP,
@@ -78,12 +81,16 @@ class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator
         // TODO.spec: define which checks should get raised to error level
         final var namedCheckZone = new SystemProcess("named-checkzone", fqdn(assetEntity));
         final var zonefileString = toZonefileString(assetEntity);
+        final var zoneFileErrorResult = zoneFileErrors != null ? zoneFileErrors : result;
         if (namedCheckZone.execute(zonefileString) != 0) {
-            // yes, named-checkzone writes error messages to stdout
+            // yes, named-checkzone writes error messages to stdout, not stderr
             stream(namedCheckZone.getStdOut().split("\n"))
                     .map(line -> line.replaceAll(" stream-0x[0-9a-f]+:", "line "))
                     .map(line -> "[" + assetEntity.getIdentifier() + "] " + line)
-                    .forEach(result::add);
+                    .forEach(zoneFileErrorResult::add);
+            if (!namedCheckZone.getStdErr().isEmpty()) {
+                result.add("unexpected stderr output for " + namedCheckZone.getCommand() + ": " + namedCheckZone.getStdErr());
+            }
         }
         return result;
     }
@@ -170,4 +177,8 @@ class HsDomainDnsSetupHostingAssetValidator extends HostingAssetEntityValidator
     private String fqdn(final HsHostingAsset assetEntity) {
         return assetEntity.getIdentifier().substring(0, assetEntity.getIdentifier().length() - IDENTIFIER_SUFFIX.length());
     }
+
+    public static void addZonefileErrorsTo(final List<String> zoneFileErrors) {
+        HsDomainDnsSetupHostingAssetValidator.zoneFileErrors = zoneFileErrors;
+    }
 }

src/main/java/net/hostsharing/hsadminng/system/SystemProcess.java

@@ -21,6 +21,11 @@ public class SystemProcess {
         this.processBuilder = new ProcessBuilder(command);
     }
 
+
+    public String getCommand() {
+        return processBuilder.command().toString();
+    }
+
     public int execute() throws IOException, InterruptedException {
         final var process = processBuilder.start();
         stdOut = fetchOutput(process.getInputStream()); // yeah, twisted ProcessBuilder API

src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java

@@ -33,7 +33,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
-import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -77,7 +77,7 @@ public class CsvDataImport extends ContextBasedTest {
     @MockBean
     HttpServletRequest request;
 
-    static final List<String> errors = new ArrayList<>();
+    static final LinkedHashSet<String> errors = new LinkedHashSet<>();
 
     public List<String[]> readAllLines(Reader reader) throws Exception {
 
@@ -318,8 +318,15 @@ public class CsvDataImport extends ContextBasedTest {
         errors.add(error);
     }
 
-    protected final void logErrors() {
+    protected static void expectError(final String expectedError) {
-        final var errorsToLog = new ArrayList<>(errors);
+        final var found = errors.remove(expectedError);
+        if (!found) {
+            logError("expected but not found: " + expectedError);
+        }
+    }
+
+    protected final void assertNoErrors() {
+        final var errorsToLog = new LinkedHashSet<>(errors);
         errors.clear();
         assertThat(errorsToLog).isEmpty();
     }

src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java

@@ -13,6 +13,7 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectEntity;
 import net.hostsharing.hsadminng.hs.hosting.asset.HsHostingAssetType;
 import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntitySaveProcessor;
 import net.hostsharing.hsadminng.hs.hosting.asset.validators.HostingAssetEntityValidatorRegistry;
+import net.hostsharing.hsadminng.hs.hosting.asset.validators.HsDomainDnsSetupHostingAssetValidator;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.MethodOrderer;
@@ -130,6 +131,7 @@ public class ImportHostingAssets extends ImportOfficeData {
     static final Integer DOMAIN_HTTP_SETUP_OFFSET = 12000000;
     static final Integer DOMAIN_MBOX_SETUP_OFFSET = 13000000;
     static final Integer DOMAIN_SMTP_SETUP_OFFSET = 14000000;
+    static List<String> zonefileErrors = new ArrayList<>();
 
     record Hive(int hive_id, String hive_name, int inet_addr_id, AtomicReference<HsHostingAssetRealEntity> serverRef) {}
 
@@ -480,7 +482,7 @@ public class ImportHostingAssets extends ImportOfficeData {
     }
 
     private String vmName(final String zonenfileName) {
-        return zonenfileName.substring(zonenfileName.length()-"vm0000.json".length()).substring(0, 6);
+        return zonenfileName.substring(zonenfileName.length() - "vm0000.json".length()).substring(0, 6);
     }
 
     @Test
@@ -578,7 +580,11 @@ public class ImportHostingAssets extends ImportOfficeData {
     @Order(18999)
     @ContinueOnFailure
     void logValidationErrors() {
-        this.logErrors();
+        if (isImportingControlledTestData()) {
+            expectError("zonedata dom_owner of mellis.de is old00 but expected to be mim00");
+            expectError("\nexpected: \"vm1068\"\n but was: \"vm1093\"");
+        }
+        this.assertNoErrors();
     }
 
     // --------------------------------------------------------------------------------------------
@@ -769,7 +775,8 @@ public class ImportHostingAssets extends ImportOfficeData {
     @Test
     @Order(19999)
     void logErrorsAfterPersistingHostingAssets() {
-        logErrors();
+        errors.addAll(zonefileErrors);
+        assertNoErrors();
     }
 
     private void persistRecursively(final Integer key, final HsBookingItemEntity bi) {
@@ -783,22 +790,26 @@ public class ImportHostingAssets extends ImportOfficeData {
 
     private void persistHostingAssetsOfType(final HsHostingAssetType... hsHostingAssetTypes) {
         final var hsHostingAssetTypeSet = stream(hsHostingAssetTypes).collect(toSet());
-        //        jpaAttempt.transacted(() -> {
+
-        hostingAssets.forEach((key, ha) -> {
+        if (hsHostingAssetTypeSet.contains(DOMAIN_DNS_SETUP)) {
-                    jpaAttempt.transacted(() -> {
+            HsDomainDnsSetupHostingAssetValidator.addZonefileErrorsTo(zonefileErrors);
-                        context(rbacSuperuser);
+        }
-                        if (hsHostingAssetTypeSet.contains(ha.getType())) {
+
-                            new HostingAssetEntitySaveProcessor(em, ha)
+        jpaAttempt.transacted(() ->
-                                    .preprocessEntity()
+                hostingAssets.forEach((key, ha) -> {
-                                    .validateEntityIgnoring("'EMAIL_ALIAS:.*\\.config\\.target' .*")
+                    context(rbacSuperuser); // if put only outside the loop, it seems to get lost after a while, no idea why
-                                    .prepareForSave()
+                    if (hsHostingAssetTypeSet.contains(ha.getType())) {
-                                    .saveUsing(entity -> persist(key, entity))
+                        logError(() ->
-                                    .validateContext();
+                                new HostingAssetEntitySaveProcessor(em, ha)
-                        }
+                                        .preprocessEntity()
-                    }).assertSuccessful();
+                                        .validateEntityIgnoring("'EMAIL_ALIAS:.*\\.config\\.target' .*")
-                }
+                                        .prepareForSave()
-        );
+                                        .saveUsing(entity -> persist(key, entity))
-        //        }).assertSuccessful();
+                                        .validateContext()
+                        );
+                    }
+                })
+        ).assertSuccessful();
     }
 
     private void importIpNumbers(final String[] header, final List<String[]> records) {
@@ -1249,14 +1260,18 @@ public class ImportHostingAssets extends ImportOfficeData {
                                     entry("multiviews", options.contains("multiviews")),
                                     entry("subdomains", withDefault(rec.getString("valid_subdomain_names"), "*")
                                             .split(",")),
-                                    entry("fcgi-php-bin", withDefault(rec.getString("fcgi_php_bin"),
+                                    entry("fcgi-php-bin", withDefault(
-                                            httpDomainSetupValidator.getProperty("fcgi-php-bin").defaultValue() )),
+                                            rec.getString("fcgi_php_bin"),
-                                    entry("passenger-nodejs", withDefault(rec.getString("passenger_nodejs"),
+                                            httpDomainSetupValidator.getProperty("fcgi-php-bin").defaultValue())),
-                                            httpDomainSetupValidator.getProperty("passenger-nodejs").defaultValue() )),
+                                    entry("passenger-nodejs", withDefault(
-                                    entry("passenger-python", withDefault(rec.getString("passenger_python"),
+                                            rec.getString("passenger_nodejs"),
-                                            httpDomainSetupValidator.getProperty("passenger-python").defaultValue() )),
+                                            httpDomainSetupValidator.getProperty("passenger-nodejs").defaultValue())),
-                                    entry("passenger-ruby", withDefault(rec.getString("passenger_ruby"),
+                                    entry("passenger-python", withDefault(
-                                            httpDomainSetupValidator.getProperty("passenger-ruby").defaultValue() ))
+                                            rec.getString("passenger_python"),
+                                            httpDomainSetupValidator.getProperty("passenger-python").defaultValue())),
+                                    entry("passenger-ruby", withDefault(
+                                            rec.getString("passenger_ruby"),
+                                            httpDomainSetupValidator.getProperty("passenger-ruby").defaultValue()))
                             ))
                             .build();
                     hostingAssets.put(DOMAIN_HTTP_SETUP_OFFSET + domain_id, domainHttpSetupAsset);
@@ -1304,7 +1319,9 @@ public class ImportHostingAssets extends ImportOfficeData {
         if (defaultValue instanceof String defaultStringValue) {
             return givenValue != null && !givenValue.isBlank() ? givenValue : defaultStringValue;
         }
-        throw new RuntimeException("property default value expected to be of type string, but is of type " + defaultValue.getClass().getSimpleName());
+        throw new RuntimeException(
+                "property default value expected to be of type string, but is of type " + defaultValue.getClass()
+                        .getSimpleName());
     }
 
     private void importZonefiles(final String vmName, final String zonenfilesJson) {
@@ -1317,11 +1334,11 @@ public class ImportHostingAssets extends ImportOfficeData {
             final Map<String, Map<String, Object>> zoneData = jsonMapper.readValue(zonenfilesJson, Map.class);
             importZonenfile(vmName, zoneData);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException("cannot read zonefile JSON: '"+zonenfilesJson+"'", e);
+            throw new RuntimeException("cannot read zonefile JSON: '" + zonenfilesJson + "'", e);
         }
     }
 
-    private void importZonenfile( final String vmName, final Map<String, Map<String, Object>> zoneDataForVM) {
+    private void importZonenfile(final String vmName, final Map<String, Map<String, Object>> zoneDataForVM) {
         zoneDataForVM.forEach((domainName, zoneData) -> {
             final var domainAsset = domainSetupsByName.get(domainName);
             if (domainAsset != null) {
@@ -1336,8 +1353,8 @@ public class ImportHostingAssets extends ImportOfficeData {
                         .getAssignedToAsset();
                 final var domOwner = zoneData.remove("DOM_OWNER");
                 final var expectedDomOwner = domUser.getIdentifier();
-                if ( domOwner.equals(expectedDomOwner) ) {
+                if (domOwner.equals(expectedDomOwner)) {
-                    logError( () -> assertThat(vmName).isEqualTo(domUser.getParentAsset().getParentAsset().getIdentifier() ));
+                    logError(() -> assertThat(vmName).isEqualTo(domUser.getParentAsset().getParentAsset().getIdentifier()));
 
                     //noinspection unchecked
                     zoneData.put("user-RR", ((ArrayList<ArrayList<Object>>) zoneData.get("user-RR")).stream()
@@ -1346,7 +1363,8 @@ public class ImportHostingAssets extends ImportOfficeData {
                     );
                     domainDnsSetupAsset.getConfig().putAll(zoneData);
                 } else {
-                    logError("zonedata dom_owner of " + domainAsset.getIdentifier() + " is " + domOwner + " but expected to be " + expectedDomOwner);
+                    logError("zonedata dom_owner of " + domainAsset.getIdentifier() + " is " + domOwner + " but expected to be "
+                            + expectedDomOwner);
                 }
             }
         });

src/test/java/net/hostsharing/hsadminng/hs/migration/ImportOfficeData.java

@@ -611,7 +611,7 @@ public class ImportOfficeData extends CsvDataImport {
     @Order(9000)
     @ContinueOnFailure
     void logCollectedErrorsBeforePersist() {
-        logErrors();
+        assertNoErrors();
     }
 
     @Test
@@ -732,7 +732,7 @@ public class ImportOfficeData extends CsvDataImport {
     @Order(9999)
     @ContinueOnFailure
     void logCollectedErrors() {
-        this.logErrors();
+        this.assertNoErrors();
     }
 
     private void importBusinessPartners(final String[] header, final List<String[]> records) {