KOGITO-7676: Implement Flyway DB schema migration (#1431)

* KOGITO-7676: Implement Flyway DB schema migration * Disabled schema generaration in PostgreSQL Integration tests * - Disable auto-DDL in PostgreSQL Data Index - Disabled Flyway migrate-on-start * - Fixed integration tests for Flyway integration * - Fixed integration tests for Flyway integration * - modified ddl zip config * incorporating PR coments * - Cleanup manual DDL scripts genration * - Fixing job-service integration tests * - Updated multi-repo-zip script
apache · Dec 9, 2022 · b8e4290 · b8e4290
1 parent 24ddc67
commit b8e4290
Show file tree

Hide file tree

Showing 13 changed files with 262 additions and 254 deletions.
diff --git a/...vice-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java b/...vice-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java
@@ -47,7 +47,6 @@ public void start() {
         LOGGER.debug("Starting PostgreSQL Quarkus test resource");
         properties.clear();
         Network network = Network.newNetwork();
-        postgresql.withInitScript("data_index_postgresql_create.sql");
         postgresql.withNetwork(network);
         postgresql.withNetworkAliases("postgresql");
         postgresql.waitingFor(Wait.forListeningPort());

diff --git a/...ommon/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java b/...ommon/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java
@@ -30,6 +30,8 @@ public void setPostgreSqlURL(String postgreSqlURL, String username, String passw
         addEnv("QUARKUS_DATASOURCE_JDBC_URL", postgreSqlURL);
         addEnv("QUARKUS_DATASOURCE_USERNAME", username);
         addEnv("QUARKUS_DATASOURCE_PASSWORD", password);
+        addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
+        addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
     }
 
     @Override

diff --git a/...integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/...integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
@@ -117,17 +117,6 @@
         <groupId>com.coderplus.maven.plugins</groupId>
         <artifactId>copy-rename-maven-plugin</artifactId>
         <executions>
-          <execution>
-            <id>copy-postgresql-file</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql</sourceFile>
-              <destinationFile>${project.basedir}/src/main/resources/data_index_postgresql_create.sql</destinationFile>
-            </configuration>
-          </execution>
           <execution>
             <id>rename-oracle-file</id>
             <phase>generate-sources</phase>

diff --git a/...egration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/...egration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
@@ -128,17 +128,6 @@
         <groupId>com.coderplus.maven.plugins</groupId>
         <artifactId>copy-rename-maven-plugin</artifactId>
         <executions>
-          <execution>
-            <id>copy-postgresql-file</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql</sourceFile>
-              <destinationFile>${project.basedir}/src/main/resources/data_index_postgresql_create.sql</destinationFile>
-            </configuration>
-          </execution>
           <execution>
             <id>rename-oracle-file</id>
             <phase>generate-sources</phase>

diff --git a/...boot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java b/...boot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java
@@ -35,6 +35,8 @@ protected Map<String, String> getProperties() {
         Map<String, String> properties = new HashMap<>();
         properties.put(KOGITO_DATA_INDEX_SERVICE_URL, "http://localhost:" + getTestResource().getMappedPort());
         properties.putAll(getTestResource().getProperties());
+        properties.put("spring.flyway.enabled", "true");
+        properties.put("spring.flyway.baseline-on-migrate", "true");
         return properties;
     }
 

diff --git a/...obs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java b/...obs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
@@ -163,6 +163,9 @@ protected void configurePostgreSQLToService(Collection<GenericContainer<?>> cont
                                 service.addEnv("QUARKUS_DATASOURCE_USERNAME", username);
                                 service.addEnv("QUARKUS_DATASOURCE_PASSWORD", password);
                                 service.addEnv("QUARKUS_DATASOURCE_DB-KIND", "postgresql");
+                                service.addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
+                                service.addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
+                                service.addEnv("QUARKUS_FLYWAY_CLEAN_AT_START", "false");
                             });
                 });
     }

diff --git a/...s/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java b/...s/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
@@ -57,7 +57,7 @@ public void init(JobServiceTestResource annotation) {
         if (annotation.dataIndexEnabled()) {
             DataIndexPostgreSqlContainer container = new DataIndexPostgreSqlContainer();
             container.addProtoFileFolder();
-            KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer().withInitScript("data_index_postgresql_create.sql");
+            KogitoPostgreSqlContainer postgresql = new KogitoPostgreSqlContainer();
             resource.withServiceContainer("data-index", container, postgresql);
         }
     }

diff --git a/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
@@ -65,24 +65,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>com.coderplus.maven.plugins</groupId>
-        <artifactId>copy-rename-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-postgresql-file</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <sourceFile>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql</sourceFile>
-              <destinationFile>${project.basedir}/target/classes/data_index_postgresql_create.sql</destinationFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml
@@ -29,6 +29,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-container-image-jib</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-flyway</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.kie.kogito</groupId>

diff --git a/...ata-index-service/data-index-service-postgresql/src/main/resources/application.properties b/...ata-index-service/data-index-service-postgresql/src/main/resources/application.properties
@@ -8,6 +8,9 @@ quarkus.kafka.health.enabled=true
 quarkus.kafka.bootstrap-servers=localhost:9092
 %dev.kafka.bootstrap.servers=localhost:9092
 
+#Flyway
+quarkus.flyway.baseline-on-migrate=true
+
 mp.messaging.incoming.kogito-processinstances-events.connector=smallrye-kafka
 mp.messaging.incoming.kogito-processinstances-events.topic=kogito-processinstances-events
 mp.messaging.incoming.kogito-processinstances-events.group.id=kogito-data-index-processinstances
@@ -41,4 +44,4 @@ quarkus.hibernate-orm.physical-naming-strategy=org.hibernate.boot.model.naming.C
 
 #Container image
 quarkus.container-image.build=${quarkus.build.image:true}
-quarkus.container-image.group=org.kie.kogito
+quarkus.container-image.group=org.kie.kogito
diff --git a/...data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql b/...data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql