Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KOGITO-7676: Implement Flyway DB schema migration #1431

Merged
merged 10 commits into from
Dec 9, 2022
+262 −254
Merged

KOGITO-7676: Implement Flyway DB schema migration #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
668b4bb
KOGITO-7676: Implement Flyway DB schema migration
akumar074 Aug 1, 2022
c847360
Disabled schema generaration in PostgreSQL Integration tests
akumar074 Aug 26, 2022
89b8294
- Disable auto-DDL in PostgreSQL Data Index
akumar074 Sep 22, 2022
932be02
- Fixed integration tests for Flyway integration
akumar074 Sep 29, 2022
f131dbc
- Fixed integration tests for Flyway integration
akumar074 Sep 30, 2022
aceb351
- modified ddl zip config
akumar074 Oct 7, 2022
2d39e97
incorporating PR coments
akumar074 Dec 6, 2022
3d16dfb
- Cleanup manual DDL scripts genration
akumar074 Dec 7, 2022
929dd94
- Fixing job-service integration tests
akumar074 Dec 7, 2022
1581ab5
- Updated multi-repo-zip script
akumar074 Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...vice-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions ...ommon/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions ...integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions ...egration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions ...boot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
3 changes: 3 additions & 0 deletions ...obs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
18 changes: 0 additions & 18 deletions ...ation-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 4 additions & 0 deletions data-index/data-index-service/data-index-service-postgresql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion ...ata-index-service/data-index-service-postgresql/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
208 changes: 0 additions & 208 deletions ...data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql
View file
Open in desktop

This file was deleted.

Loading