diff --git a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java index 90589092f..5c976c670 100644 --- a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java +++ b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java @@ -15,7 +15,7 @@ public class AerospikeEnterpriseConfigurer { private final AerospikeProperties aerospikeProperties; private final AerospikeEnterpriseProperties enterpriseProperties; - public void configure(GenericContainer aerospikeContainer) throws IOException, InterruptedException { + public void configure(GenericContainer aerospikeContainer) throws IOException, InterruptedException { if (aerospikeProperties.getFeatureKey() == null || aerospikeProperties.getFeatureKey().isBlank()) { log.warn("Evaluation feature key file not provided by 'embedded.aerospike.featureKey' property. " + "Pay attention to license details: https://github.com/aerospike/aerospike-server.docker/blob/master/enterprise/ENTERPRISE_LICENSE"); @@ -32,9 +32,9 @@ private void setupDisallowExpunge(GenericContainer aerospikeContainer) throws String namespace = aerospikeProperties.getNamespace(); Container.ExecResult result = aerospikeContainer.execInContainer("asadm", "-e", String.format("enable; manage config namespace %s param disallow-expunge to true", namespace)); - if (result.getStderr().length() > 0) { + if (result.getExitCode() != 0) { throw new IllegalStateException("Failed to set up 'disallow-expunge' to true: " + result.getStderr()); } - log.info("Set up 'disallow-expunge' to true: {}", result.getStdout()); + log.info("Success setting up 'disallow-expunge' to true"); } } diff --git a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java index c9e972f1e..b4b36fbc2 100644 --- a/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java +++ b/embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java @@ -21,8 +21,9 @@ public class EnterpriseAerospikeTestOperationsAutoConfiguration { @Bean @ConditionalOnProperty(value = "embedded.aerospike.time-travel.enabled", havingValue = "true", matchIfMissing = true) public ExpiredDocumentsCleaner expiredDocumentsCleaner(IAerospikeClient client, + AerospikeEnterpriseProperties aerospikeEnterpriseProperties, AerospikeProperties properties) { - return new AerospikeExpiredDocumentsCleaner(client, properties.getNamespace(), true); + return new AerospikeExpiredDocumentsCleaner(client, properties.getNamespace(), aerospikeEnterpriseProperties.isDurableDeletes()); } } diff --git a/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties b/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties index 46efcc47a..5ac45f6a8 100644 --- a/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties +++ b/embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties @@ -1 +1 @@ -embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.3.0.16 +embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:7.0.0.3 \ No newline at end of file diff --git a/embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/ValidateEnterpriseAerospikeBootstrapConfigurationTest.java b/embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/ValidateEnterpriseAerospikeBootstrapConfigurationTest.java index 833d93117..16bbd067f 100644 --- a/embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/ValidateEnterpriseAerospikeBootstrapConfigurationTest.java +++ b/embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/ValidateEnterpriseAerospikeBootstrapConfigurationTest.java @@ -20,13 +20,13 @@ void failOnNonEnterpriseImage() { @Test void failOnUnsuitableEnterpriseImageVersion() { - contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.1.0.16_1") + contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.1.0.16") .run(context -> assertThat(context).hasFailed()); } @Test void skipValidation() { - contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike-server:6.1.0.16_1", + contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike-server:6.1.0.16", "embedded.aerospike.enabled=false") .run(context -> assertThat(context).hasNotFailed()); diff --git a/embedded-aerospike-enterprise/src/test/resources/log4j2.xml b/embedded-aerospike-enterprise/src/test/resources/log4j2.xml index c498778dc..eb5b23427 100644 --- a/embedded-aerospike-enterprise/src/test/resources/log4j2.xml +++ b/embedded-aerospike-enterprise/src/test/resources/log4j2.xml @@ -6,7 +6,7 @@ - +