fix postgres tests

Netflix · Mar 20, 2023 · d1b2c6d · d1b2c6d
1 parent 7d8c9ec
commit d1b2c6d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 42 deletions.
diff --git a/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java b/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
@@ -90,7 +90,7 @@ public PostgresQueueDAO postgresQueueDAO(
 
     @Bean
     @DependsOn({"flywayForPrimaryDb"})
-    @Conditional(PostgresIndexConditions.PostgresIndexingEnabled.class)
+    @ConditionalOnProperty(name = "conductor.indexing.type", havingValue = "postgres")
     public PostgresIndexDAO postgresIndexDAO(
             @Qualifier("postgresRetryTemplate") RetryTemplate retryTemplate,
             ObjectMapper objectMapper) {

diff --git a/...sistence/src/main/java/com/netflix/conductor/postgres/config/PostgresIndexConditions.java b/...sistence/src/main/java/com/netflix/conductor/postgres/config/PostgresIndexConditions.java
diff --git a/...es-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresIndexDAOTest.java b/...es-persistence/src/test/java/com/netflix/conductor/postgres/dao/PostgresIndexDAOTest.java
@@ -30,6 +30,7 @@
 import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.netflix.conductor.common.config.TestObjectMapperConfiguration;
@@ -53,6 +54,12 @@
             FlywayAutoConfiguration.class
         })
 @RunWith(SpringRunner.class)
+@TestPropertySource(
+        properties = {
+            "conductor.app.asyncIndexingEnabled=false",
+            "conductor.elasticsearch.version=0",
+            "conductor.indexing.type=postgres"
+        })
 @SpringBootTest
 public class PostgresIndexDAOTest {
 

diff --git a/...t/java/com/netflix/conductor/test/integration/grpc/postgres/PostgresGrpcEndToEndTest.java b/...t/java/com/netflix/conductor/test/integration/grpc/postgres/PostgresGrpcEndToEndTest.java
@@ -26,7 +26,10 @@
 @TestPropertySource(
         properties = {
             "conductor.db.type=postgres",
+            "conductor.app.asyncIndexingEnabled=false",
+            "conductor.elasticsearch.version=6",
             "conductor.grpc-server.port=8098",
+            "conductor.indexing.type=elasticsearch",
             "spring.datasource.url=jdbc:tc:postgresql:11.15-alpine:///conductor", // "tc" prefix
             // starts the
             // Postgres container