From 668b4bb4fad03cf25033f2e9845892754d63e443 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Mon, 1 Aug 2022 11:11:04 +0530 Subject: [PATCH 01/10] KOGITO-7676: Implement Flyway DB schema migration --- .../data-index-service-postgresql/pom.xml | 4 + .../src/main/resources/application.properties | 1 + .../V2.0.0__Create_Schema_Tables.sql | 208 ++++++++++++++++++ 3 files changed, 213 insertions(+) create mode 100644 data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql 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 index 3ad1c837a8..6b4ffb9c2a 100644 --- 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 @@ io.quarkus quarkus-container-image-jib + + io.quarkus + quarkus-flyway + org.kie.kogito diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties index 45f6bd5059..c56512519b 100644 --- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties @@ -7,6 +7,7 @@ kogito.data-index.blocking=true quarkus.kafka.health.enabled=true quarkus.kafka.bootstrap-servers=localhost:9092 %dev.kafka.bootstrap.servers=localhost:9092 +quarkus.flyway.migrate-at-start=true mp.messaging.incoming.kogito-processinstances-events.connector=smallrye-kafka mp.messaging.incoming.kogito-processinstances-events.topic=kogito-processinstances-events diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql new file mode 100644 index 0000000000..cf0135b755 --- /dev/null +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql @@ -0,0 +1,208 @@ + +create table attachments ( + id varchar(255) not null, + content varchar(255), + name varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table comments ( + id varchar(255) not null, + content varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table jobs ( + id varchar(255) not null, + callback_endpoint varchar(255), + endpoint varchar(255), + execution_counter int4, + expiration_time timestamp, + last_update timestamp, + node_instance_id varchar(255), + priority int4, + process_id varchar(255), + process_instance_id varchar(255), + repeat_interval int8, + repeat_limit int4, + retries int4, + root_process_id varchar(255), + root_process_instance_id varchar(255), + scheduled_id varchar(255), + status varchar(255), + primary key (id) +); + +create table milestones ( + id varchar(255) not null, + process_instance_id varchar(255) not null, + name varchar(255), + status varchar(255), + primary key (id, process_instance_id) +); + +create table nodes ( + id varchar(255) not null, + definition_id varchar(255), + enter timestamp, + exit timestamp, + name varchar(255), + node_id varchar(255), + type varchar(255), + process_instance_id varchar(255) not null, + primary key (id) +); + +create table processes ( + id varchar(255) not null, + business_key varchar(255), + end_time timestamp, + endpoint varchar(255), + message varchar(255), + node_definition_id varchar(255), + last_update_time timestamp, + parent_process_instance_id varchar(255), + process_id varchar(255), + process_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + start_time timestamp, + state int4, + variables jsonb, + primary key (id) +); + +create table processes_addons ( + process_id varchar(255) not null, + addon varchar(255) not null, + primary key (process_id, addon) +); + +create table processes_roles ( + process_id varchar(255) not null, + role varchar(255) not null, + primary key (process_id, role) +); + +create table tasks ( + id varchar(255) not null, + actual_owner varchar(255), + completed timestamp, + description varchar(255), + endpoint varchar(255), + inputs jsonb, + last_update timestamp, + name varchar(255), + outputs jsonb, + priority varchar(255), + process_id varchar(255), + process_instance_id varchar(255), + reference_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + started timestamp, + state varchar(255), + primary key (id) +); + +create table tasks_admin_groups ( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_admin_users ( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_excluded_users ( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_potential_groups ( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_potential_users ( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +alter table if exists attachments + add constraint fk_attachments_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists comments + add constraint fk_comments_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists milestones + add constraint fk_milestones_process + foreign key (process_instance_id) + references processes + on delete cascade; + +alter table if exists nodes + add constraint fk_nodes_process + foreign key (process_instance_id) + references processes + on delete cascade; + +alter table if exists processes_addons + add constraint fk_processes_addons_processes + foreign key (process_id) + references processes + on delete cascade; + +alter table if exists processes_roles + add constraint fk_processes_roles_processes + foreign key (process_id) + references processes + on delete cascade; + +alter table if exists tasks_admin_groups + add constraint fk_tasks_admin_groups_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists tasks_admin_users + add constraint fk_tasks_admin_users_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists tasks_excluded_users + add constraint fk_tasks_excluded_users_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists tasks_potential_groups + add constraint fk_tasks_potential_groups_tasks + foreign key (task_id) + references tasks + on delete cascade; + +alter table if exists tasks_potential_users + add constraint fk_tasks_potential_users_tasks + foreign key (task_id) + references tasks + on delete cascade; From c847360402a33ce81cc29e06dd0c1ff6421d0d60 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Fri, 26 Aug 2022 10:32:09 +0530 Subject: [PATCH 02/10] Disabled schema generaration in PostgreSQL Integration tests --- .../kogito/index/resources/DataIndexPostgreSqlResource.java | 1 - .../src/test/resources/application.properties | 2 +- .../integration-tests-data-index-service-springboot/pom.xml | 2 +- .../src/main/resources/application.properties | 5 ++++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java index bc9039a11b..c9d511bd64 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/resources/DataIndexPostgreSqlResource.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-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/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties index 0829044d79..5bb439dbba 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties @@ -19,4 +19,4 @@ mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer quarkus.http.auth.permission.source-files-addon.paths=/management/* -quarkus.http.auth.permission.source-files-addon.policy=permit \ No newline at end of file +quarkus.http.auth.permission.source-files-addon.policy=permit diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index cbb92b21ac..d4cdd2b74b 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -202,4 +202,4 @@ - \ No newline at end of file + diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties index c56512519b..b05279b100 100644 --- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties @@ -7,7 +7,10 @@ kogito.data-index.blocking=true quarkus.kafka.health.enabled=true quarkus.kafka.bootstrap-servers=localhost:9092 %dev.kafka.bootstrap.servers=localhost:9092 + +#Flyway quarkus.flyway.migrate-at-start=true +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 @@ -42,4 +45,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 \ No newline at end of file +quarkus.container-image.group=org.kie.kogito From 89b82940d8e087393c4fff24bd620e95fdd751c9 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Thu, 22 Sep 2022 10:05:15 +0530 Subject: [PATCH 03/10] - Disable auto-DDL in PostgreSQL Data Index - Disabled Flyway migrate-on-start --- .../pom.xml | 4 + .../src/main/resources/application.properties | 6 +- .../V1.29.0__data_index_schema_create.sql | 243 ++++++++++++++++++ ...ataIndexPostgreSqlQuarkusTestResource.java | 3 + .../src/test/resources/application.properties | 4 + .../V1.29.0__data_index_schema_create.sql | 243 ++++++++++++++++++ .../pom.xml | 2 + .../V1.29.0__data_index_schema_create.sql | 243 ++++++++++++++++++ ...DataIndexPostgreSqlSpringTestResource.java | 2 + .../src/main/resources/application.properties | 1 - .../V1.29.0__data_index_schema_create.sql | 243 ++++++++++++++++++ .../V2.0.0__Create_Schema_Tables.sql | 208 --------------- .../src/assembly/multi-repo-zip.xml | 4 +- 13 files changed, 994 insertions(+), 212 deletions(-) create mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql create mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql create mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql create mode 100644 data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql delete mode 100644 data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index 79f9e1c330..6422b8fd70 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -61,6 +61,10 @@ io.quarkus quarkus-resteasy-jackson + + io.quarkus + quarkus-flyway + org.kie.kogito kogito-quarkus-test-utils diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties index a6bb6880c5..0e3fd2fc26 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties @@ -17,4 +17,8 @@ mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer mp.messaging.outgoing.kogito-variables-events.group.id=kogito-data-index-it -mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest \ No newline at end of file +mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest + +quarkus.flyway.migrate-at-start=true +quarkus.flyway.baseline-on-migrate=true +quarkus.flyway.clean-at-start=true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql new file mode 100644 index 0000000000..58cbc17bce --- /dev/null +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql @@ -0,0 +1,243 @@ +create table attachments +( + id varchar(255) not null, + content varchar(255), + name varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table comments +( + id varchar(255) not null, + content varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table jobs +( + id varchar(255) not null, + callback_endpoint varchar(255), + endpoint varchar(255), + execution_counter int4, + expiration_time timestamp, + last_update timestamp, + node_instance_id varchar(255), + priority int4, + process_id varchar(255), + process_instance_id varchar(255), + repeat_interval int8, + repeat_limit int4, + retries int4, + root_process_id varchar(255), + root_process_instance_id varchar(255), + scheduled_id varchar(255), + status varchar(255), + primary key (id) +); + +create table milestones +( + id varchar(255) not null, + process_instance_id varchar(255) not null, + name varchar(255), + status varchar(255), + primary key (id, process_instance_id) +); + +create table nodes +( + id varchar(255) not null, + definition_id varchar(255), + enter timestamp, + exit timestamp, + name varchar(255), + node_id varchar(255), + type varchar(255), + process_instance_id varchar(255) not null, + primary key (id) +); + +create table processes +( + id varchar(255) not null, + business_key varchar(255), + end_time timestamp, + endpoint varchar(255), + message varchar(255), + node_definition_id varchar(255), + last_update_time timestamp, + parent_process_instance_id varchar(255), + process_id varchar(255), + process_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + start_time timestamp, + state int4, + variables jsonb, + primary key (id) +); + +create table processes_addons +( + process_id varchar(255) not null, + addon varchar(255) not null, + primary key (process_id, addon) +); + +create table processes_roles +( + process_id varchar(255) not null, + role varchar(255) not null, + primary key (process_id, role) +); + +create table tasks +( + id varchar(255) not null, + actual_owner varchar(255), + completed timestamp, + description varchar(255), + endpoint varchar(255), + inputs jsonb, + last_update timestamp, + name varchar(255), + outputs jsonb, + priority varchar(255), + process_id varchar(255), + process_instance_id varchar(255), + reference_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + started timestamp, + state varchar(255), + primary key (id) +); + +create table tasks_admin_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_admin_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_excluded_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_potential_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_potential_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +alter table if exists attachments + add constraint fk_attachments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists comments + add constraint fk_comments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists milestones + add constraint fk_milestones_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists nodes + add constraint fk_nodes_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists processes_addons + add constraint fk_processes_addons_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists processes_roles + add constraint fk_processes_roles_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists tasks_admin_groups + add constraint fk_tasks_admin_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_admin_users + add constraint fk_tasks_admin_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_excluded_users + add constraint fk_tasks_excluded_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_groups + add constraint fk_tasks_potential_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_users + add constraint fk_tasks_potential_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java index a90c82fbe1..0f278320ce 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java @@ -34,6 +34,9 @@ public DataIndexPostgreSqlQuarkusTestResource() { protected Map getProperties() { Map properties = new HashMap<>(); properties.put(KOGITO_DATA_INDEX_SERVICE_URL, "http://localhost:" + getTestResource().getMappedPort()); + properties.put("quarkus.flyway.migrate-at-start", "true"); + properties.put("quarkus.flyway.baseline-on-migrate", "true"); + properties.put("quarkus.flyway.clean-at-start", "true"); properties.putAll(getTestResource().getProperties()); return properties; } diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties index 5bb439dbba..e35eb43f0d 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties @@ -20,3 +20,7 @@ mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka. quarkus.http.auth.permission.source-files-addon.paths=/management/* quarkus.http.auth.permission.source-files-addon.policy=permit + +quarkus.flyway.migrate-at-start=true +quarkus.flyway.baseline-on-migrate=true +quarkus.flyway.clean-at-start=true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql new file mode 100644 index 0000000000..58cbc17bce --- /dev/null +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql @@ -0,0 +1,243 @@ +create table attachments +( + id varchar(255) not null, + content varchar(255), + name varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table comments +( + id varchar(255) not null, + content varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table jobs +( + id varchar(255) not null, + callback_endpoint varchar(255), + endpoint varchar(255), + execution_counter int4, + expiration_time timestamp, + last_update timestamp, + node_instance_id varchar(255), + priority int4, + process_id varchar(255), + process_instance_id varchar(255), + repeat_interval int8, + repeat_limit int4, + retries int4, + root_process_id varchar(255), + root_process_instance_id varchar(255), + scheduled_id varchar(255), + status varchar(255), + primary key (id) +); + +create table milestones +( + id varchar(255) not null, + process_instance_id varchar(255) not null, + name varchar(255), + status varchar(255), + primary key (id, process_instance_id) +); + +create table nodes +( + id varchar(255) not null, + definition_id varchar(255), + enter timestamp, + exit timestamp, + name varchar(255), + node_id varchar(255), + type varchar(255), + process_instance_id varchar(255) not null, + primary key (id) +); + +create table processes +( + id varchar(255) not null, + business_key varchar(255), + end_time timestamp, + endpoint varchar(255), + message varchar(255), + node_definition_id varchar(255), + last_update_time timestamp, + parent_process_instance_id varchar(255), + process_id varchar(255), + process_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + start_time timestamp, + state int4, + variables jsonb, + primary key (id) +); + +create table processes_addons +( + process_id varchar(255) not null, + addon varchar(255) not null, + primary key (process_id, addon) +); + +create table processes_roles +( + process_id varchar(255) not null, + role varchar(255) not null, + primary key (process_id, role) +); + +create table tasks +( + id varchar(255) not null, + actual_owner varchar(255), + completed timestamp, + description varchar(255), + endpoint varchar(255), + inputs jsonb, + last_update timestamp, + name varchar(255), + outputs jsonb, + priority varchar(255), + process_id varchar(255), + process_instance_id varchar(255), + reference_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + started timestamp, + state varchar(255), + primary key (id) +); + +create table tasks_admin_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_admin_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_excluded_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_potential_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_potential_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +alter table if exists attachments + add constraint fk_attachments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists comments + add constraint fk_comments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists milestones + add constraint fk_milestones_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists nodes + add constraint fk_nodes_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists processes_addons + add constraint fk_processes_addons_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists processes_roles + add constraint fk_processes_roles_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists tasks_admin_groups + add constraint fk_tasks_admin_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_admin_users + add constraint fk_tasks_admin_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_excluded_users + add constraint fk_tasks_excluded_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_groups + add constraint fk_tasks_potential_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_users + add constraint fk_tasks_potential_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index d4cdd2b74b..7b6c5d2e3c 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -14,6 +14,8 @@ **/KogitoApplication.java + true + true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql new file mode 100644 index 0000000000..58cbc17bce --- /dev/null +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql @@ -0,0 +1,243 @@ +create table attachments +( + id varchar(255) not null, + content varchar(255), + name varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table comments +( + id varchar(255) not null, + content varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table jobs +( + id varchar(255) not null, + callback_endpoint varchar(255), + endpoint varchar(255), + execution_counter int4, + expiration_time timestamp, + last_update timestamp, + node_instance_id varchar(255), + priority int4, + process_id varchar(255), + process_instance_id varchar(255), + repeat_interval int8, + repeat_limit int4, + retries int4, + root_process_id varchar(255), + root_process_instance_id varchar(255), + scheduled_id varchar(255), + status varchar(255), + primary key (id) +); + +create table milestones +( + id varchar(255) not null, + process_instance_id varchar(255) not null, + name varchar(255), + status varchar(255), + primary key (id, process_instance_id) +); + +create table nodes +( + id varchar(255) not null, + definition_id varchar(255), + enter timestamp, + exit timestamp, + name varchar(255), + node_id varchar(255), + type varchar(255), + process_instance_id varchar(255) not null, + primary key (id) +); + +create table processes +( + id varchar(255) not null, + business_key varchar(255), + end_time timestamp, + endpoint varchar(255), + message varchar(255), + node_definition_id varchar(255), + last_update_time timestamp, + parent_process_instance_id varchar(255), + process_id varchar(255), + process_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + start_time timestamp, + state int4, + variables jsonb, + primary key (id) +); + +create table processes_addons +( + process_id varchar(255) not null, + addon varchar(255) not null, + primary key (process_id, addon) +); + +create table processes_roles +( + process_id varchar(255) not null, + role varchar(255) not null, + primary key (process_id, role) +); + +create table tasks +( + id varchar(255) not null, + actual_owner varchar(255), + completed timestamp, + description varchar(255), + endpoint varchar(255), + inputs jsonb, + last_update timestamp, + name varchar(255), + outputs jsonb, + priority varchar(255), + process_id varchar(255), + process_instance_id varchar(255), + reference_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + started timestamp, + state varchar(255), + primary key (id) +); + +create table tasks_admin_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_admin_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_excluded_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_potential_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_potential_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +alter table if exists attachments + add constraint fk_attachments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists comments + add constraint fk_comments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists milestones + add constraint fk_milestones_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists nodes + add constraint fk_nodes_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists processes_addons + add constraint fk_processes_addons_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists processes_roles + add constraint fk_processes_roles_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists tasks_admin_groups + add constraint fk_tasks_admin_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_admin_users + add constraint fk_tasks_admin_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_excluded_users + add constraint fk_tasks_excluded_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_groups + add constraint fk_tasks_potential_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_users + add constraint fk_tasks_potential_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java index fa4148f178..425f3f75b8 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/test/java/org/kie/kogito/index/spring/DataIndexPostgreSqlSpringTestResource.java @@ -35,6 +35,8 @@ protected Map getProperties() { Map 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/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties index b05279b100..5fdbe8698e 100644 --- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/application.properties @@ -9,7 +9,6 @@ quarkus.kafka.bootstrap-servers=localhost:9092 %dev.kafka.bootstrap.servers=localhost:9092 #Flyway -quarkus.flyway.migrate-at-start=true quarkus.flyway.baseline-on-migrate=true mp.messaging.incoming.kogito-processinstances-events.connector=smallrye-kafka diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql new file mode 100644 index 0000000000..58cbc17bce --- /dev/null +++ b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql @@ -0,0 +1,243 @@ +create table attachments +( + id varchar(255) not null, + content varchar(255), + name varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table comments +( + id varchar(255) not null, + content varchar(255), + updated_at timestamp, + updated_by varchar(255), + task_id varchar(255) not null, + primary key (id) +); + +create table jobs +( + id varchar(255) not null, + callback_endpoint varchar(255), + endpoint varchar(255), + execution_counter int4, + expiration_time timestamp, + last_update timestamp, + node_instance_id varchar(255), + priority int4, + process_id varchar(255), + process_instance_id varchar(255), + repeat_interval int8, + repeat_limit int4, + retries int4, + root_process_id varchar(255), + root_process_instance_id varchar(255), + scheduled_id varchar(255), + status varchar(255), + primary key (id) +); + +create table milestones +( + id varchar(255) not null, + process_instance_id varchar(255) not null, + name varchar(255), + status varchar(255), + primary key (id, process_instance_id) +); + +create table nodes +( + id varchar(255) not null, + definition_id varchar(255), + enter timestamp, + exit timestamp, + name varchar(255), + node_id varchar(255), + type varchar(255), + process_instance_id varchar(255) not null, + primary key (id) +); + +create table processes +( + id varchar(255) not null, + business_key varchar(255), + end_time timestamp, + endpoint varchar(255), + message varchar(255), + node_definition_id varchar(255), + last_update_time timestamp, + parent_process_instance_id varchar(255), + process_id varchar(255), + process_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + start_time timestamp, + state int4, + variables jsonb, + primary key (id) +); + +create table processes_addons +( + process_id varchar(255) not null, + addon varchar(255) not null, + primary key (process_id, addon) +); + +create table processes_roles +( + process_id varchar(255) not null, + role varchar(255) not null, + primary key (process_id, role) +); + +create table tasks +( + id varchar(255) not null, + actual_owner varchar(255), + completed timestamp, + description varchar(255), + endpoint varchar(255), + inputs jsonb, + last_update timestamp, + name varchar(255), + outputs jsonb, + priority varchar(255), + process_id varchar(255), + process_instance_id varchar(255), + reference_name varchar(255), + root_process_id varchar(255), + root_process_instance_id varchar(255), + started timestamp, + state varchar(255), + primary key (id) +); + +create table tasks_admin_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_admin_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_excluded_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +create table tasks_potential_groups +( + task_id varchar(255) not null, + group_id varchar(255) not null, + primary key (task_id, group_id) +); + +create table tasks_potential_users +( + task_id varchar(255) not null, + user_id varchar(255) not null, + primary key (task_id, user_id) +); + +alter table if exists attachments + add constraint fk_attachments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists comments + add constraint fk_comments_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists milestones + add constraint fk_milestones_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists nodes + add constraint fk_nodes_process + foreign key (process_instance_id) + references processes + on +delete +cascade; + +alter table if exists processes_addons + add constraint fk_processes_addons_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists processes_roles + add constraint fk_processes_roles_processes + foreign key (process_id) + references processes + on +delete +cascade; + +alter table if exists tasks_admin_groups + add constraint fk_tasks_admin_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_admin_users + add constraint fk_tasks_admin_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_excluded_users + add constraint fk_tasks_excluded_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_groups + add constraint fk_tasks_potential_groups_tasks + foreign key (task_id) + references tasks + on +delete +cascade; + +alter table if exists tasks_potential_users + add constraint fk_tasks_potential_users_tasks + foreign key (task_id) + references tasks + on +delete +cascade; diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql deleted file mode 100644 index cf0135b755..0000000000 --- a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V2.0.0__Create_Schema_Tables.sql +++ /dev/null @@ -1,208 +0,0 @@ - -create table attachments ( - id varchar(255) not null, - content varchar(255), - name varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table comments ( - id varchar(255) not null, - content varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table jobs ( - id varchar(255) not null, - callback_endpoint varchar(255), - endpoint varchar(255), - execution_counter int4, - expiration_time timestamp, - last_update timestamp, - node_instance_id varchar(255), - priority int4, - process_id varchar(255), - process_instance_id varchar(255), - repeat_interval int8, - repeat_limit int4, - retries int4, - root_process_id varchar(255), - root_process_instance_id varchar(255), - scheduled_id varchar(255), - status varchar(255), - primary key (id) -); - -create table milestones ( - id varchar(255) not null, - process_instance_id varchar(255) not null, - name varchar(255), - status varchar(255), - primary key (id, process_instance_id) -); - -create table nodes ( - id varchar(255) not null, - definition_id varchar(255), - enter timestamp, - exit timestamp, - name varchar(255), - node_id varchar(255), - type varchar(255), - process_instance_id varchar(255) not null, - primary key (id) -); - -create table processes ( - id varchar(255) not null, - business_key varchar(255), - end_time timestamp, - endpoint varchar(255), - message varchar(255), - node_definition_id varchar(255), - last_update_time timestamp, - parent_process_instance_id varchar(255), - process_id varchar(255), - process_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - start_time timestamp, - state int4, - variables jsonb, - primary key (id) -); - -create table processes_addons ( - process_id varchar(255) not null, - addon varchar(255) not null, - primary key (process_id, addon) -); - -create table processes_roles ( - process_id varchar(255) not null, - role varchar(255) not null, - primary key (process_id, role) -); - -create table tasks ( - id varchar(255) not null, - actual_owner varchar(255), - completed timestamp, - description varchar(255), - endpoint varchar(255), - inputs jsonb, - last_update timestamp, - name varchar(255), - outputs jsonb, - priority varchar(255), - process_id varchar(255), - process_instance_id varchar(255), - reference_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - started timestamp, - state varchar(255), - primary key (id) -); - -create table tasks_admin_groups ( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_admin_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_excluded_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_potential_groups ( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_potential_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -alter table if exists attachments - add constraint fk_attachments_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists comments - add constraint fk_comments_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists milestones - add constraint fk_milestones_process - foreign key (process_instance_id) - references processes - on delete cascade; - -alter table if exists nodes - add constraint fk_nodes_process - foreign key (process_instance_id) - references processes - on delete cascade; - -alter table if exists processes_addons - add constraint fk_processes_addons_processes - foreign key (process_id) - references processes - on delete cascade; - -alter table if exists processes_roles - add constraint fk_processes_roles_processes - foreign key (process_id) - references processes - on delete cascade; - -alter table if exists tasks_admin_groups - add constraint fk_tasks_admin_groups_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists tasks_admin_users - add constraint fk_tasks_admin_users_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists tasks_excluded_users - add constraint fk_tasks_excluded_users_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists tasks_potential_groups - add constraint fk_tasks_potential_groups_tasks - foreign key (task_id) - references tasks - on delete cascade; - -alter table if exists tasks_potential_users - add constraint fk_tasks_potential_users_tasks - foreign key (task_id) - references tasks - on delete cascade; diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml index 0b822df668..ccee577628 100644 --- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml +++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml @@ -17,7 +17,7 @@ - ${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources + ${project.root.dir}/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration postgresql *_create.sql @@ -46,4 +46,4 @@ trusty_service_create.sql - \ No newline at end of file + From 932be02746647bfa091e8ff4d28feed785b6dc61 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Thu, 29 Sep 2022 16:39:11 +0530 Subject: [PATCH 04/10] - Fixed integration tests for Flyway integration --- .../DataIndexPostgreSqlContainer.java | 3 + .../src/main/resources/application.properties | 4 - .../V1.29.0__data_index_schema_create.sql | 243 ------------------ ...ataIndexPostgreSqlQuarkusTestResource.java | 3 - .../src/test/resources/application.properties | 4 - .../V1.29.0__data_index_schema_create.sql | 243 ------------------ 6 files changed, 3 insertions(+), 497 deletions(-) delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java index f6f71d291f..049e1df595 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java @@ -30,6 +30,9 @@ 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"); + addEnv("QUARKUS_FLYWAY_CLEAN_AT_START", "true"); } @Override diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties index 0e3fd2fc26..e909e892e1 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties @@ -18,7 +18,3 @@ mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer mp.messaging.outgoing.kogito-variables-events.group.id=kogito-data-index-it mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest - -quarkus.flyway.migrate-at-start=true -quarkus.flyway.baseline-on-migrate=true -quarkus.flyway.clean-at-start=true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql deleted file mode 100644 index 58cbc17bce..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql +++ /dev/null @@ -1,243 +0,0 @@ -create table attachments -( - id varchar(255) not null, - content varchar(255), - name varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table comments -( - id varchar(255) not null, - content varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table jobs -( - id varchar(255) not null, - callback_endpoint varchar(255), - endpoint varchar(255), - execution_counter int4, - expiration_time timestamp, - last_update timestamp, - node_instance_id varchar(255), - priority int4, - process_id varchar(255), - process_instance_id varchar(255), - repeat_interval int8, - repeat_limit int4, - retries int4, - root_process_id varchar(255), - root_process_instance_id varchar(255), - scheduled_id varchar(255), - status varchar(255), - primary key (id) -); - -create table milestones -( - id varchar(255) not null, - process_instance_id varchar(255) not null, - name varchar(255), - status varchar(255), - primary key (id, process_instance_id) -); - -create table nodes -( - id varchar(255) not null, - definition_id varchar(255), - enter timestamp, - exit timestamp, - name varchar(255), - node_id varchar(255), - type varchar(255), - process_instance_id varchar(255) not null, - primary key (id) -); - -create table processes -( - id varchar(255) not null, - business_key varchar(255), - end_time timestamp, - endpoint varchar(255), - message varchar(255), - node_definition_id varchar(255), - last_update_time timestamp, - parent_process_instance_id varchar(255), - process_id varchar(255), - process_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - start_time timestamp, - state int4, - variables jsonb, - primary key (id) -); - -create table processes_addons -( - process_id varchar(255) not null, - addon varchar(255) not null, - primary key (process_id, addon) -); - -create table processes_roles -( - process_id varchar(255) not null, - role varchar(255) not null, - primary key (process_id, role) -); - -create table tasks -( - id varchar(255) not null, - actual_owner varchar(255), - completed timestamp, - description varchar(255), - endpoint varchar(255), - inputs jsonb, - last_update timestamp, - name varchar(255), - outputs jsonb, - priority varchar(255), - process_id varchar(255), - process_instance_id varchar(255), - reference_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - started timestamp, - state varchar(255), - primary key (id) -); - -create table tasks_admin_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_admin_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_excluded_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_potential_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_potential_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -alter table if exists attachments - add constraint fk_attachments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists comments - add constraint fk_comments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists milestones - add constraint fk_milestones_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists nodes - add constraint fk_nodes_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists processes_addons - add constraint fk_processes_addons_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists processes_roles - add constraint fk_processes_roles_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists tasks_admin_groups - add constraint fk_tasks_admin_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_admin_users - add constraint fk_tasks_admin_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_excluded_users - add constraint fk_tasks_excluded_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_groups - add constraint fk_tasks_potential_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_users - add constraint fk_tasks_potential_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java index 0f278320ce..a90c82fbe1 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/java/org/kie/kogito/index/quarkus/DataIndexPostgreSqlQuarkusTestResource.java @@ -34,9 +34,6 @@ public DataIndexPostgreSqlQuarkusTestResource() { protected Map getProperties() { Map properties = new HashMap<>(); properties.put(KOGITO_DATA_INDEX_SERVICE_URL, "http://localhost:" + getTestResource().getMappedPort()); - properties.put("quarkus.flyway.migrate-at-start", "true"); - properties.put("quarkus.flyway.baseline-on-migrate", "true"); - properties.put("quarkus.flyway.clean-at-start", "true"); properties.putAll(getTestResource().getProperties()); return properties; } diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties index e35eb43f0d..5bb439dbba 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties @@ -20,7 +20,3 @@ mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka. quarkus.http.auth.permission.source-files-addon.paths=/management/* quarkus.http.auth.permission.source-files-addon.policy=permit - -quarkus.flyway.migrate-at-start=true -quarkus.flyway.baseline-on-migrate=true -quarkus.flyway.clean-at-start=true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql deleted file mode 100644 index 58cbc17bce..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/db/migration/V1.29.0__data_index_schema_create.sql +++ /dev/null @@ -1,243 +0,0 @@ -create table attachments -( - id varchar(255) not null, - content varchar(255), - name varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table comments -( - id varchar(255) not null, - content varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table jobs -( - id varchar(255) not null, - callback_endpoint varchar(255), - endpoint varchar(255), - execution_counter int4, - expiration_time timestamp, - last_update timestamp, - node_instance_id varchar(255), - priority int4, - process_id varchar(255), - process_instance_id varchar(255), - repeat_interval int8, - repeat_limit int4, - retries int4, - root_process_id varchar(255), - root_process_instance_id varchar(255), - scheduled_id varchar(255), - status varchar(255), - primary key (id) -); - -create table milestones -( - id varchar(255) not null, - process_instance_id varchar(255) not null, - name varchar(255), - status varchar(255), - primary key (id, process_instance_id) -); - -create table nodes -( - id varchar(255) not null, - definition_id varchar(255), - enter timestamp, - exit timestamp, - name varchar(255), - node_id varchar(255), - type varchar(255), - process_instance_id varchar(255) not null, - primary key (id) -); - -create table processes -( - id varchar(255) not null, - business_key varchar(255), - end_time timestamp, - endpoint varchar(255), - message varchar(255), - node_definition_id varchar(255), - last_update_time timestamp, - parent_process_instance_id varchar(255), - process_id varchar(255), - process_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - start_time timestamp, - state int4, - variables jsonb, - primary key (id) -); - -create table processes_addons -( - process_id varchar(255) not null, - addon varchar(255) not null, - primary key (process_id, addon) -); - -create table processes_roles -( - process_id varchar(255) not null, - role varchar(255) not null, - primary key (process_id, role) -); - -create table tasks -( - id varchar(255) not null, - actual_owner varchar(255), - completed timestamp, - description varchar(255), - endpoint varchar(255), - inputs jsonb, - last_update timestamp, - name varchar(255), - outputs jsonb, - priority varchar(255), - process_id varchar(255), - process_instance_id varchar(255), - reference_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - started timestamp, - state varchar(255), - primary key (id) -); - -create table tasks_admin_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_admin_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_excluded_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_potential_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_potential_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -alter table if exists attachments - add constraint fk_attachments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists comments - add constraint fk_comments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists milestones - add constraint fk_milestones_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists nodes - add constraint fk_nodes_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists processes_addons - add constraint fk_processes_addons_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists processes_roles - add constraint fk_processes_roles_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists tasks_admin_groups - add constraint fk_tasks_admin_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_admin_users - add constraint fk_tasks_admin_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_excluded_users - add constraint fk_tasks_excluded_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_groups - add constraint fk_tasks_potential_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_users - add constraint fk_tasks_potential_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; From f131dbced8a773e585bea7edf857c373fbcc9837 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Fri, 30 Sep 2022 12:21:01 +0530 Subject: [PATCH 05/10] - Fixed integration tests for Flyway integration --- .../pom.xml | 4 - .../pom.xml | 2 - .../V1.29.0__data_index_schema_create.sql | 243 ------------------ 3 files changed, 249 deletions(-) delete mode 100644 apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index 6422b8fd70..79f9e1c330 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -61,10 +61,6 @@ io.quarkus quarkus-resteasy-jackson - - io.quarkus - quarkus-flyway - org.kie.kogito kogito-quarkus-test-utils diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index 7b6c5d2e3c..d4cdd2b74b 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -14,8 +14,6 @@ **/KogitoApplication.java - true - true diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql deleted file mode 100644 index 58cbc17bce..0000000000 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql +++ /dev/null @@ -1,243 +0,0 @@ -create table attachments -( - id varchar(255) not null, - content varchar(255), - name varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table comments -( - id varchar(255) not null, - content varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) -); - -create table jobs -( - id varchar(255) not null, - callback_endpoint varchar(255), - endpoint varchar(255), - execution_counter int4, - expiration_time timestamp, - last_update timestamp, - node_instance_id varchar(255), - priority int4, - process_id varchar(255), - process_instance_id varchar(255), - repeat_interval int8, - repeat_limit int4, - retries int4, - root_process_id varchar(255), - root_process_instance_id varchar(255), - scheduled_id varchar(255), - status varchar(255), - primary key (id) -); - -create table milestones -( - id varchar(255) not null, - process_instance_id varchar(255) not null, - name varchar(255), - status varchar(255), - primary key (id, process_instance_id) -); - -create table nodes -( - id varchar(255) not null, - definition_id varchar(255), - enter timestamp, - exit timestamp, - name varchar(255), - node_id varchar(255), - type varchar(255), - process_instance_id varchar(255) not null, - primary key (id) -); - -create table processes -( - id varchar(255) not null, - business_key varchar(255), - end_time timestamp, - endpoint varchar(255), - message varchar(255), - node_definition_id varchar(255), - last_update_time timestamp, - parent_process_instance_id varchar(255), - process_id varchar(255), - process_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - start_time timestamp, - state int4, - variables jsonb, - primary key (id) -); - -create table processes_addons -( - process_id varchar(255) not null, - addon varchar(255) not null, - primary key (process_id, addon) -); - -create table processes_roles -( - process_id varchar(255) not null, - role varchar(255) not null, - primary key (process_id, role) -); - -create table tasks -( - id varchar(255) not null, - actual_owner varchar(255), - completed timestamp, - description varchar(255), - endpoint varchar(255), - inputs jsonb, - last_update timestamp, - name varchar(255), - outputs jsonb, - priority varchar(255), - process_id varchar(255), - process_instance_id varchar(255), - reference_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - started timestamp, - state varchar(255), - primary key (id) -); - -create table tasks_admin_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_admin_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_excluded_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -create table tasks_potential_groups -( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) -); - -create table tasks_potential_users -( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) -); - -alter table if exists attachments - add constraint fk_attachments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists comments - add constraint fk_comments_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists milestones - add constraint fk_milestones_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists nodes - add constraint fk_nodes_process - foreign key (process_instance_id) - references processes - on -delete -cascade; - -alter table if exists processes_addons - add constraint fk_processes_addons_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists processes_roles - add constraint fk_processes_roles_processes - foreign key (process_id) - references processes - on -delete -cascade; - -alter table if exists tasks_admin_groups - add constraint fk_tasks_admin_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_admin_users - add constraint fk_tasks_admin_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_excluded_users - add constraint fk_tasks_excluded_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_groups - add constraint fk_tasks_potential_groups_tasks - foreign key (task_id) - references tasks - on -delete -cascade; - -alter table if exists tasks_potential_users - add constraint fk_tasks_potential_users_tasks - foreign key (task_id) - references tasks - on -delete -cascade; From aceb351b593648cfe5229d3c4d1fd424cd2ab0b5 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Fri, 7 Oct 2022 14:18:02 +0530 Subject: [PATCH 06/10] - modified ddl zip config --- ..._create.sql => V1.29.0__create_data_index_schema_flyway.sql} | 0 persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/{V1.29.0__data_index_schema_create.sql => V1.29.0__create_data_index_schema_flyway.sql} (100%) diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__create_data_index_schema_flyway.sql similarity index 100% rename from data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__data_index_schema_create.sql rename to data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__create_data_index_schema_flyway.sql diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml index ccee577628..b8fcdb4b06 100644 --- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml +++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml @@ -20,7 +20,7 @@ ${project.root.dir}/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration postgresql - *_create.sql + *_flyway.sql From 2d39e9782103a9b5e293c35f23027a62053be7e3 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar <19465051+akumar074@users.noreply.github.com> Date: Tue, 6 Dec 2022 12:45:37 +0530 Subject: [PATCH 07/10] incorporating PR coments --- .../src/main/resources/application.properties | 2 +- .../src/test/resources/application.properties | 2 +- .../integration-tests-data-index-service-springboot/pom.xml | 2 +- ...a_index_schema_flyway.sql => V1.32.0__data_index_create.sql} | 0 persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/{V1.29.0__create_data_index_schema_flyway.sql => V1.32.0__data_index_create.sql} (100%) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties index e909e892e1..a6bb6880c5 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/main/resources/application.properties @@ -17,4 +17,4 @@ mp.messaging.outgoing.kogito-variables-events.connector=smallrye-kafka mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer mp.messaging.outgoing.kogito-variables-events.group.id=kogito-data-index-it -mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest +mp.messaging.outgoing.kogito-variables-events.auto.offset.reset=earliest \ No newline at end of file diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties index 5bb439dbba..0829044d79 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/src/test/resources/application.properties @@ -19,4 +19,4 @@ mp.messaging.outgoing.kogito-variables-events.topic=kogito-variables-events mp.messaging.outgoing.kogito-variables-events.value.serializer=org.apache.kafka.common.serialization.StringSerializer quarkus.http.auth.permission.source-files-addon.paths=/management/* -quarkus.http.auth.permission.source-files-addon.policy=permit +quarkus.http.auth.permission.source-files-addon.policy=permit \ No newline at end of file diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index d4cdd2b74b..cbb92b21ac 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -202,4 +202,4 @@ - + \ No newline at end of file diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__create_data_index_schema_flyway.sql b/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql similarity index 100% rename from data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.29.0__create_data_index_schema_flyway.sql rename to data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml index b8fcdb4b06..87aa1f16e7 100644 --- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml +++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml @@ -20,7 +20,7 @@ ${project.root.dir}/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration postgresql - *_flyway.sql + *.sql From 3d16dfb0713402a271da57107405920bcd709e42 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar <19465051+akumar074@users.noreply.github.com> Date: Wed, 7 Dec 2022 12:28:29 +0530 Subject: [PATCH 08/10] - Cleanup manual DDL scripts genration --- .../pom.xml | 11 - .../pom.xml | 11 - .../src/main/resources/data_index_create.sql | 208 ------------------ 3 files changed, 230 deletions(-) delete mode 100644 data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml index 79f9e1c330..0b8fab440e 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-quarkus/pom.xml @@ -117,17 +117,6 @@ com.coderplus.maven.plugins copy-rename-maven-plugin - - copy-postgresql-file - generate-sources - - copy - - - ${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql - ${project.basedir}/src/main/resources/data_index_postgresql_create.sql - - rename-oracle-file generate-sources diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml index cbb92b21ac..189d882c3d 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-springboot/pom.xml @@ -128,17 +128,6 @@ com.coderplus.maven.plugins copy-rename-maven-plugin - - copy-postgresql-file - generate-sources - - copy - - - ${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql - ${project.basedir}/src/main/resources/data_index_postgresql_create.sql - - rename-oracle-file generate-sources diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql deleted file mode 100644 index 1f62c2b9c2..0000000000 --- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql +++ /dev/null @@ -1,208 +0,0 @@ - - create table attachments ( - id varchar(255) not null, - content varchar(255), - name varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) - ); - - create table comments ( - id varchar(255) not null, - content varchar(255), - updated_at timestamp, - updated_by varchar(255), - task_id varchar(255) not null, - primary key (id) - ); - - create table jobs ( - id varchar(255) not null, - callback_endpoint varchar(255), - endpoint varchar(255), - execution_counter int4, - expiration_time timestamp, - last_update timestamp, - node_instance_id varchar(255), - priority int4, - process_id varchar(255), - process_instance_id varchar(255), - repeat_interval int8, - repeat_limit int4, - retries int4, - root_process_id varchar(255), - root_process_instance_id varchar(255), - scheduled_id varchar(255), - status varchar(255), - primary key (id) - ); - - create table milestones ( - id varchar(255) not null, - process_instance_id varchar(255) not null, - name varchar(255), - status varchar(255), - primary key (id, process_instance_id) - ); - - create table nodes ( - id varchar(255) not null, - definition_id varchar(255), - enter timestamp, - exit timestamp, - name varchar(255), - node_id varchar(255), - type varchar(255), - process_instance_id varchar(255) not null, - primary key (id) - ); - - create table processes ( - id varchar(255) not null, - business_key varchar(255), - end_time timestamp, - endpoint varchar(255), - message varchar(255), - node_definition_id varchar(255), - last_update_time timestamp, - parent_process_instance_id varchar(255), - process_id varchar(255), - process_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - start_time timestamp, - state int4, - variables jsonb, - primary key (id) - ); - - create table processes_addons ( - process_id varchar(255) not null, - addon varchar(255) not null, - primary key (process_id, addon) - ); - - create table processes_roles ( - process_id varchar(255) not null, - role varchar(255) not null, - primary key (process_id, role) - ); - - create table tasks ( - id varchar(255) not null, - actual_owner varchar(255), - completed timestamp, - description varchar(255), - endpoint varchar(255), - inputs jsonb, - last_update timestamp, - name varchar(255), - outputs jsonb, - priority varchar(255), - process_id varchar(255), - process_instance_id varchar(255), - reference_name varchar(255), - root_process_id varchar(255), - root_process_instance_id varchar(255), - started timestamp, - state varchar(255), - primary key (id) - ); - - create table tasks_admin_groups ( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) - ); - - create table tasks_admin_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) - ); - - create table tasks_excluded_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) - ); - - create table tasks_potential_groups ( - task_id varchar(255) not null, - group_id varchar(255) not null, - primary key (task_id, group_id) - ); - - create table tasks_potential_users ( - task_id varchar(255) not null, - user_id varchar(255) not null, - primary key (task_id, user_id) - ); - - alter table if exists attachments - add constraint fk_attachments_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists comments - add constraint fk_comments_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists milestones - add constraint fk_milestones_process - foreign key (process_instance_id) - references processes - on delete cascade; - - alter table if exists nodes - add constraint fk_nodes_process - foreign key (process_instance_id) - references processes - on delete cascade; - - alter table if exists processes_addons - add constraint fk_processes_addons_processes - foreign key (process_id) - references processes - on delete cascade; - - alter table if exists processes_roles - add constraint fk_processes_roles_processes - foreign key (process_id) - references processes - on delete cascade; - - alter table if exists tasks_admin_groups - add constraint fk_tasks_admin_groups_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists tasks_admin_users - add constraint fk_tasks_admin_users_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists tasks_excluded_users - add constraint fk_tasks_excluded_users_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists tasks_potential_groups - add constraint fk_tasks_potential_groups_tasks - foreign key (task_id) - references tasks - on delete cascade; - - alter table if exists tasks_potential_users - add constraint fk_tasks_potential_users_tasks - foreign key (task_id) - references tasks - on delete cascade; From 929dd944518b7bb24769e1d84488c63b0cc8e461 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Thu, 8 Dec 2022 01:52:19 +0530 Subject: [PATCH 09/10] - Fixing job-service integration tests --- .../DataIndexPostgreSqlContainer.java | 1 - .../test/resources/CompositeTestResource.java | 3 +++ ...JobServiceCompositeQuarkusTestResource.java | 2 +- .../pom.xml | 18 ------------------ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java index 049e1df595..724202b725 100644 --- a/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java +++ b/apps-integration-tests/integration-tests-data-index-service/integration-tests-data-index-service-common/src/main/java/org/kie/kogito/index/testcontainers/DataIndexPostgreSqlContainer.java @@ -32,7 +32,6 @@ public void setPostgreSqlURL(String postgreSqlURL, String username, String passw addEnv("QUARKUS_DATASOURCE_PASSWORD", password); addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true"); addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true"); - addEnv("QUARKUS_FLYWAY_CLEAN_AT_START", "true"); } @Override diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java index 2d2c93409d..7686bb5a1b 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/test/resources/CompositeTestResource.java @@ -163,6 +163,9 @@ protected void configurePostgreSQLToService(Collection> 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/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java index 7d30deb6d9..ea83a423dc 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/src/main/java/org/kie/kogito/test/resources/JobServiceCompositeQuarkusTestResource.java +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-common-quarkus/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/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml index f8819926ae..8ab5fee6fa 100644 --- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml +++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml @@ -65,24 +65,6 @@ - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - - - copy-postgresql-file - generate-sources - - copy - - - ${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/data_index_create.sql - ${project.basedir}/target/classes/data_index_postgresql_create.sql - - - - From 1581ab565c3846e332a61c1e7b524ccd543f7462 Mon Sep 17 00:00:00 2001 From: Abhishek Gill Date: Fri, 9 Dec 2022 12:33:30 +0530 Subject: [PATCH 10/10] - Updated multi-repo-zip script --- .../main/resources/db/migration/V1.32.0__data_index_create.sql | 0 persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename data-index/{data-index-service/data-index-service-postgresql => data-index-storage/data-index-storage-postgresql}/src/main/resources/db/migration/V1.32.0__data_index_create.sql (100%) diff --git a/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql similarity index 100% rename from data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration/V1.32.0__data_index_create.sql diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml index 87aa1f16e7..25d8a52bb1 100644 --- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml +++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml @@ -17,7 +17,7 @@ - ${project.root.dir}/data-index/data-index-service/data-index-service-postgresql/src/main/resources/db/migration + ${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/migration postgresql *.sql