diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish b/.ci/jenkins/Jenkinsfile.daily-dev-publish index d343e7d5a2d..3d2311d083d 100644 --- a/.ci/jenkins/Jenkinsfile.daily-dev-publish +++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish @@ -135,10 +135,10 @@ pipeline { KOGITO_MANAGEMENT_CONSOLE__name = 'incubator-kie-kogito-management-console' KOGITO_MANAGEMENT_CONSOLE__buildTag = "${params.BRANCH_NAME}" - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__registry = 'docker.io' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__account = 'apache' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__name = 'kogito-postgresql-db-migrator-tool' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__buildTag = "${params.BRANCH_NAME}" + KOGITO_DB_MIGRATOR_TOOL__registry = 'docker.io' + KOGITO_DB_MIGRATOR_TOOL__account = 'apache' + KOGITO_DB_MIGRATOR_TOOL__name = 'kogito-db-migrator-tool' + KOGITO_DB_MIGRATOR_TOOL__buildTag = "${params.BRANCH_NAME}" SONATAFLOW_BUILDER_IMAGE__registry = 'docker.io' SONATAFLOW_BUILDER_IMAGE__account = 'apache' @@ -555,14 +555,14 @@ pipeline { } } - stage('Push kogito-postgresql-db-migrator-tool to Docker Hub') { + stage('Push kogito-db-migrator-tool to Docker Hub') { steps { script { dockerUtils.pushImageToRegistry( - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__registry}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__account}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__name}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__buildTag}", + "${env.KOGITO_DB_MIGRATOR_TOOL__registry}", + "${env.KOGITO_DB_MIGRATOR_TOOL__account}", + "${env.KOGITO_DB_MIGRATOR_TOOL__name}", + "${env.KOGITO_DB_MIGRATOR_TOOL__buildTag}", "${pipelineVars.dockerHubUserCredentialsId}", "${pipelineVars.dockerHubTokenCredentialsId}" ) diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-db-migrator-tool b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-db-migrator-tool index a1eaff874f1..e6eec502f15 100644 --- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-db-migrator-tool +++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-db-migrator-tool @@ -40,16 +40,16 @@ pipeline { KIE_TOOLS_BUILD__buildContainerImages = 'true' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__registry = 'docker.io' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__account = 'apache' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__name = 'kogito-postgresql-db-migrator-tool' - KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__buildTag = "${params.RELEASE_VERSION}" + KOGITO_DB_MIGRATOR_TOOL__registry = 'docker.io' + KOGITO_DB_MIGRATOR_TOOL__account = 'apache' + KOGITO_DB_MIGRATOR_TOOL__name = 'kogito-db-migrator-tool' + KOGITO_DB_MIGRATOR_TOOL__buildTag = "${params.RELEASE_VERSION}" RELEASE_ARTIFACTS_DIR = "${WORKSPACE}/release-artifacts" DOCKER_CONFIG = "${WORKSPACE}/.docker" - PNPM_FILTER_STRING = '-F @kie-tools/kogito-postgresql-db-migrator-tool...' + PNPM_FILTER_STRING = '-F @kie-tools/kogito-db-migrator-tool...' } stages { @@ -137,17 +137,17 @@ pipeline { } } - stage('Push kogito-postgresql-db-migrator-tool to Docker Hub') { + stage('Push kogito-db-migrator-tool to Docker Hub') { when { expression { !params.DRY_RUN && params.RELEASE_CANDIDATE_VERSION == '' } } steps { script { dockerUtils.pushImageToRegistry( - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__registry}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__account}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__name}", - "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL_buildTag}", + "${env.KOGITO_DB_MIGRATOR_TOOL__registry}", + "${env.KOGITO_DB_MIGRATOR_TOOL__account}", + "${env.KOGITO_DB_MIGRATOR_TOOL__name}", + "${env.KOGITO_DB_MIGRATOR_TOOL_buildTag}", "${pipelineVars.dockerHubUserCredentialsId}", "${pipelineVars.dockerHubTokenCredentialsId}" ) @@ -161,11 +161,11 @@ pipeline { } steps { script { - env.RELEASE_IMAGE_TAR_FILE = "incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-kogito-postgresql-db-migrator-tool-image.tar.gz" + env.RELEASE_IMAGE_TAR_FILE = "incubator-kie-${params.RELEASE_CANDIDATE_VERSION}-kogito-db-migrator-tool-image.tar.gz" sh """#!/bin/bash -el mkdir ${env.RELEASE_ARTIFACTS_DIR} - docker save "${env.KOGITO_POSTGRESQL_DB_MIGRATOR_TOOL__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}/${env.KOGITO_MANAGEMENT_CONSOLE__name}:${params.RELEASE_VERSION}" | gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}" + docker save "${env.KOGITO_DB_MIGRATOR_TOOL__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}/${env.KOGITO_MANAGEMENT_CONSOLE__name}:${params.RELEASE_VERSION}" | gzip > "${env.RELEASE_ARTIFACTS_DIR}/${env.RELEASE_IMAGE_TAR_FILE}" """.trim() } } diff --git a/packages/kogito-postgresql-db-migrator-tool-image/README.md b/packages/kogito-db-migrator-tool-image/README.md similarity index 97% rename from packages/kogito-postgresql-db-migrator-tool-image/README.md rename to packages/kogito-db-migrator-tool-image/README.md index c357c0389b7..b7369264d78 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/README.md +++ b/packages/kogito-db-migrator-tool-image/README.md @@ -17,7 +17,7 @@ # Kogito PostgreSQL DB Migrator Tool Image -This package contains the `Containerfile/Dockerfile` and scripts to build a container image for Kogito PostgreSQL DB Migrator Tool. Details about the Kogito PostgreSQL DB Migrator Tool can be found [here](../kogito-postgresql-db-migrator-tool/README.md) +This package contains the `Containerfile/Dockerfile` and scripts to build a container image for Kogito PostgreSQL DB Migrator Tool. Details about the Kogito PostgreSQL DB Migrator Tool can be found [here](../kogito-db-migrator-tool/README.md) ## Additional requirements @@ -64,7 +64,7 @@ An example to use diverse environment variables --env QUARKUS_DATASOURCE_JOBSSERVICE_USERNAME= \ --env QUARKUS_DATASOURCE_JOBSSERVICE_PASSWORD= \ --env QUARKUS_FLYWAY_JOBSSERVICE_SCHEMAS=jobs-service \ - docker.io/apache/incubator-kie-kogito-postgresql-db-migrator-tool:main + docker.io/apache/incubator-kie-kogito-db-migrator-tool:main ``` --- diff --git a/packages/kogito-postgresql-db-migrator-tool-image/env/index.js b/packages/kogito-db-migrator-tool-image/env/index.js similarity index 96% rename from packages/kogito-postgresql-db-migrator-tool-image/env/index.js rename to packages/kogito-db-migrator-tool-image/env/index.js index 6cbd330c45d..00dc1399d44 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/env/index.js +++ b/packages/kogito-db-migrator-tool-image/env/index.js @@ -33,7 +33,7 @@ module.exports = composeEnv([rootEnv, sonataflowImageCommonEnv], { description: "The image registry account.", }, KOGITO_DB_MIGRATOR_TOOL_IMAGE__name: { - default: "incubator-kie-kogito-postgresql-db-migrator-tool", + default: "incubator-kie-kogito-db-migrator-tool", description: "The image name.", }, KOGITO_DB_MIGRATOR_TOOL_IMAGE__buildTag: { diff --git a/packages/kogito-postgresql-db-migrator-tool-image/install.js b/packages/kogito-db-migrator-tool-image/install.js similarity index 96% rename from packages/kogito-postgresql-db-migrator-tool-image/install.js rename to packages/kogito-db-migrator-tool-image/install.js index 3553989693a..cec8142a81d 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/install.js +++ b/packages/kogito-db-migrator-tool-image/install.js @@ -50,7 +50,7 @@ let imageYaml = fs.readFileSync(originalYamlPath, "utf8"); const imageUrl = `${env.kogitoDbMigratorToolImage.registry}/${env.kogitoDbMigratorToolImage.account}/${env.kogitoDbMigratorToolImage.name}`; // Replace the whole string between quotes ("") with the image name -imageYaml = imageYaml.replace(/(?<=")(.*kie-kogito-postgresql-db-migrator-tool.*)(?=")/gm, imageUrl); +imageYaml = imageYaml.replace(/(?<=")(.*kie-kogito-db-migrator-tool.*)(?=")/gm, imageUrl); // Write file and then rename it to match the image name fs.writeFileSync(originalYamlPath, imageYaml); diff --git a/packages/kogito-postgresql-db-migrator-tool-image/package.json b/packages/kogito-db-migrator-tool-image/package.json similarity index 90% rename from packages/kogito-postgresql-db-migrator-tool-image/package.json rename to packages/kogito-db-migrator-tool-image/package.json index c1f105076dd..106e3a540f8 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/package.json +++ b/packages/kogito-db-migrator-tool-image/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@kie-tools/kogito-postgresql-db-migrator-tool-image", + "name": "@kie-tools/kogito-db-migrator-tool-image", "version": "0.0.0", "description": "", "license": "Apache-2.0", @@ -21,7 +21,7 @@ "build:prod:linux": "pnpm build", "build:prod:win32:darwin": "echo \"Build skipped on Windows and MacOS\"", "copy-assets": "run-script-os", - "copy-assets:linux:darwin": "rimraf build && cp -R ./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R resources/* build && mkdir -p build/modules/kogito-postgres-db-migration-deps/quarkus-app && cp -R ./node_modules/@kie-tools/kogito-postgresql-db-migrator-tool/target/quarkus-app/* build/modules/kogito-postgres-db-migration-deps/quarkus-app", + "copy-assets:linux:darwin": "rimraf build && cp -R ./node_modules/@kie-tools/sonataflow-image-common/resources build && cp -R resources/* build && mkdir -p build/modules/kogito-postgres-db-migration-deps/quarkus-app && cp -R ./node_modules/@kie-tools/kogito-db-migrator-tool/target/quarkus-app/* build/modules/kogito-postgres-db-migration-deps/quarkus-app", "format": "prettier --write . --ignore-path=../../.prettierignore --ignore-path=../../.gitignore", "image:build": "run-script-os", "image:build:linux": "pnpm setup:env make -C ./build build", @@ -31,7 +31,7 @@ "venv-activate": ". ./node_modules/@kie-tools/python-venv/venv/bin/activate" }, "dependencies": { - "@kie-tools/kogito-postgresql-db-migrator-tool": "workspace:*", + "@kie-tools/kogito-db-migrator-tool": "workspace:*", "@kie-tools/python-venv": "workspace:*", "@kie-tools/root-env": "workspace:*", "@kie-tools/sonataflow-image-common": "workspace:*" diff --git a/packages/kogito-postgresql-db-migrator-tool-image/resources/incubator-kie-kogito-postgresql-db-migrator-tool-image.yaml b/packages/kogito-db-migrator-tool-image/resources/incubator-kie-kogito-db-migrator-tool-image.yaml similarity index 95% rename from packages/kogito-postgresql-db-migrator-tool-image/resources/incubator-kie-kogito-postgresql-db-migrator-tool-image.yaml rename to packages/kogito-db-migrator-tool-image/resources/incubator-kie-kogito-db-migrator-tool-image.yaml index a063cf8a9f1..b1e5727432e 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/resources/incubator-kie-kogito-postgresql-db-migrator-tool-image.yaml +++ b/packages/kogito-db-migrator-tool-image/resources/incubator-kie-kogito-db-migrator-tool-image.yaml @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -name: "docker.io/apache/incubator-kie-kogito-postgresql-db-migrator-tool" +name: "docker.io/apache/incubator-kie-kogito-db-migrator-tool" version: "main" from: registry.access.redhat.com/ubi8/openjdk-17-runtime:1.20 description: DBMigratorTool image for Data Index and Jobs Service database migration diff --git a/packages/kogito-postgresql-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml b/packages/kogito-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml similarity index 84% rename from packages/kogito-postgresql-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml rename to packages/kogito-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml index e90ebaa5962..3cb2a3a8a85 100644 --- a/packages/kogito-postgresql-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml +++ b/packages/kogito-db-migrator-tool-image/resources/modules/kogito-postgres-db-migration-deps/module.yaml @@ -20,7 +20,7 @@ schema_version: 1 name: org.kie.kogito.postgresql.db-migration-deps version: "main" artifacts: - # The following artifact comes from the package kogito-postgresql-db-migrator-tool during the pnpm build:dev phase - - name: kogito-postgresql-db-migrator-tool-quarkus-app + # The following artifact comes from the package kogito-db-migrator-tool during the pnpm build:dev phase + - name: kogito-db-migrator-tool-quarkus-app path: ./quarkus-app dest: /home/kogito/bin diff --git a/packages/kogito-postgresql-db-migrator-tool/.gitignore b/packages/kogito-db-migrator-tool/.gitignore similarity index 66% rename from packages/kogito-postgresql-db-migrator-tool/.gitignore rename to packages/kogito-db-migrator-tool/.gitignore index f30772d459b..8404612fa0f 100644 --- a/packages/kogito-postgresql-db-migrator-tool/.gitignore +++ b/packages/kogito-db-migrator-tool/.gitignore @@ -1,4 +1,4 @@ -# kogito-postgresql-db-migrator-tool +# kogito-db-migrator-tool src/main/resources/postgresql src/main/resources/ansi src/main/resources/h2 \ No newline at end of file diff --git a/packages/kogito-postgresql-db-migrator-tool/README.md b/packages/kogito-db-migrator-tool/README.md similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/README.md rename to packages/kogito-db-migrator-tool/README.md diff --git a/packages/kogito-postgresql-db-migrator-tool/env/index.js b/packages/kogito-db-migrator-tool/env/index.js similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/env/index.js rename to packages/kogito-db-migrator-tool/env/index.js diff --git a/packages/kogito-postgresql-db-migrator-tool/install.js b/packages/kogito-db-migrator-tool/install.js similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/install.js rename to packages/kogito-db-migrator-tool/install.js diff --git a/packages/kogito-postgresql-db-migrator-tool/package.json b/packages/kogito-db-migrator-tool/package.json similarity index 95% rename from packages/kogito-postgresql-db-migrator-tool/package.json rename to packages/kogito-db-migrator-tool/package.json index 07b805ebfd9..7ca5e31839b 100644 --- a/packages/kogito-postgresql-db-migrator-tool/package.json +++ b/packages/kogito-db-migrator-tool/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@kie-tools/kogito-postgresql-db-migrator-tool", + "name": "@kie-tools/kogito-db-migrator-tool", "version": "0.0.0", "description": "", "license": "Apache-2.0", diff --git a/packages/kogito-postgresql-db-migrator-tool/pom.xml b/packages/kogito-db-migrator-tool/pom.xml similarity index 98% rename from packages/kogito-postgresql-db-migrator-tool/pom.xml rename to packages/kogito-db-migrator-tool/pom.xml index 590391fdb2c..0130bd33fda 100644 --- a/packages/kogito-postgresql-db-migrator-tool/pom.xml +++ b/packages/kogito-db-migrator-tool/pom.xml @@ -31,7 +31,7 @@ 4.0.0 org.kie.kogito - kogito-postgresql-db-migrator-tool + kogito-db-migrator-tool diff --git a/packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBConnectionChecker.java b/packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBConnectionChecker.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBConnectionChecker.java rename to packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBConnectionChecker.java diff --git a/packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBMigrator.java b/packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBMigrator.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBMigrator.java rename to packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/DBMigrator.java diff --git a/packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/MigrationService.java b/packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/MigrationService.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/MigrationService.java rename to packages/kogito-db-migrator-tool/src/main/java/org/kie/kogito/postgresql/migrator/MigrationService.java diff --git a/packages/kogito-postgresql-db-migrator-tool/src/main/resources/application.properties b/packages/kogito-db-migrator-tool/src/main/resources/application.properties similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/main/resources/application.properties rename to packages/kogito-db-migrator-tool/src/main/resources/application.properties diff --git a/packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBConnectionCheckerTest.java b/packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBConnectionCheckerTest.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBConnectionCheckerTest.java rename to packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBConnectionCheckerTest.java diff --git a/packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBMigratorTest.java b/packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBMigratorTest.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBMigratorTest.java rename to packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/DBMigratorTest.java diff --git a/packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/MigrationServiceTest.java b/packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/MigrationServiceTest.java similarity index 100% rename from packages/kogito-postgresql-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/MigrationServiceTest.java rename to packages/kogito-db-migrator-tool/src/test/java/org/kie/kogito/postgresql/migrator/MigrationServiceTest.java diff --git a/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh index 88ac842f76b..fc661b7dcdc 100755 --- a/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh +++ b/packages/sonataflow-image-common/resources/scripts/build-kogito-apps-components.sh @@ -56,7 +56,7 @@ if [ ! -z "${CYPRESS_BINARY_URL}" ]; then fi case ${imageName} in - "incubator-kie-kogito-postgresql-db-migrator-tool") + "incubator-kie-kogito-db-migrator-tool") contextDir="db-migrator-tool/image" ;; "incubator-kie-kogito-data-index-ephemeral") diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d5ce994492a..dc2a65ef136 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7403,7 +7403,7 @@ importers: specifier: ^1.1.6 version: 1.1.6 - packages/kogito-postgresql-db-migrator-tool: + packages/kogito-db-migrator-tool: dependencies: '@kie-tools/maven-base': specifier: workspace:* @@ -7419,11 +7419,11 @@ importers: specifier: ^1.1.6 version: 1.1.6 - packages/kogito-postgresql-db-migrator-tool-image: + packages/kogito-db-migrator-tool-image: dependencies: - '@kie-tools/kogito-postgresql-db-migrator-tool': + '@kie-tools/kogito-db-migrator-tool': specifier: workspace:* - version: link:../kogito-postgresql-db-migrator-tool + version: link:../kogito-db-migrator-tool '@kie-tools/python-venv': specifier: workspace:* version: link:../python-venv @@ -24518,6 +24518,7 @@ packages: glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} + deprecated: Glob versions prior to v9 are no longer supported global-dirs@3.0.0: resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==} @@ -25033,6 +25034,7 @@ packages: inflight@1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} diff --git a/repo/graph.dot b/repo/graph.dot index 26347531f62..dab90395800 100644 --- a/repo/graph.dot +++ b/repo/graph.dot @@ -150,13 +150,13 @@ digraph G { "@kie-tools/sonataflow-image-common" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-data-index-ephemeral-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-data-index-postgresql-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/kogito-db-migrator-tool" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; + "@kie-tools/kogito-db-migrator-tool-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-jit-runner-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-jobs-service-allinone-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-jobs-service-ephemeral-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie/kogito-jobs-service-postgresql-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools/runtime-tools-management-console-webapp" [ color = "blue", fontcolor = "blue", style = "rounded" ]; - "@kie-tools/kogito-postgresql-db-migrator-tool" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; - "@kie-tools/kogito-postgresql-db-migrator-tool-image" [ color = "black", fontcolor = "black", style = "dashed, rounded" ]; "@kie-tools-core/kubernetes-bridge" [ color = "purple", fontcolor = "purple", style = "rounded" ]; "@kie-tools-core/workspace" [ color = "purple", fontcolor = "purple", style = "rounded" ]; "@kie-tools/unitables-dmn" [ color = "blue", fontcolor = "blue", style = "rounded" ]; @@ -473,6 +473,9 @@ digraph G { "@kie/kogito-data-index-ephemeral-image" -> "@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ]; "@kie/kogito-data-index-postgresql-image" -> "@kie-tools/maven-base" [ style = "dashed", color = "black" ]; "@kie/kogito-data-index-postgresql-image" -> "@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ]; + "@kie-tools/kogito-db-migrator-tool" -> "@kie-tools/maven-base" [ style = "solid", color = "black" ]; + "@kie-tools/kogito-db-migrator-tool-image" -> "@kie-tools/kogito-db-migrator-tool" [ style = "solid", color = "black" ]; + "@kie-tools/kogito-db-migrator-tool-image" -> "@kie-tools/sonataflow-image-common" [ style = "solid", color = "black" ]; "@kie/kogito-jit-runner-image" -> "@kie-tools/maven-base" [ style = "dashed", color = "black" ]; "@kie/kogito-jit-runner-image" -> "@kie-tools/sonataflow-image-common" [ style = "dashed", color = "black" ]; "@kie/kogito-jobs-service-allinone-image" -> "@kie-tools/maven-base" [ style = "dashed", color = "black" ]; @@ -484,9 +487,6 @@ digraph G { "@kie-tools/kogito-management-console" -> "@kie-tools/image-builder" [ style = "dashed", color = "black" ]; "@kie-tools/kogito-management-console" -> "@kie-tools/image-env-to-json" [ style = "dashed", color = "black" ]; "@kie-tools/kogito-management-console" -> "@kie-tools/runtime-tools-management-console-webapp" [ style = "dashed", color = "black" ]; - "@kie-tools/kogito-postgresql-db-migrator-tool" -> "@kie-tools/maven-base" [ style = "solid", color = "black" ]; - "@kie-tools/kogito-postgresql-db-migrator-tool-image" -> "@kie-tools/kogito-postgresql-db-migrator-tool" [ style = "solid", color = "black" ]; - "@kie-tools/kogito-postgresql-db-migrator-tool-image" -> "@kie-tools/sonataflow-image-common" [ style = "solid", color = "black" ]; "@kie-tools-core/kubernetes-bridge" -> "@kie-tools/cors-proxy-api" [ style = "solid", color = "purple" ]; "@kie-tools/maven-base" -> "@kie-tools/root-env" [ style = "dashed", color = "black" ]; "@kie-tools/maven-m2-repo-via-http-image" -> "@kie-tools/image-builder" [ style = "dashed", color = "black" ]; diff --git a/repo/graph.json b/repo/graph.json index 87eb602e6a7..55c4a9b4b5e 100644 --- a/repo/graph.json +++ b/repo/graph.json @@ -192,10 +192,10 @@ { "id": "@kie/kogito-base-builder-image" }, { "id": "@kie-tools/sonataflow-image-common" }, { "id": "@kie-tools/python-venv" }, + { "id": "@kie-tools/kogito-db-migrator-tool" }, + { "id": "@kie-tools/kogito-db-migrator-tool-image" }, { "id": "@kie/kogito-jit-runner-image" }, { "id": "@kie/kogito-jobs-service-allinone-image" }, - { "id": "@kie-tools/kogito-postgresql-db-migrator-tool" }, - { "id": "@kie-tools/kogito-postgresql-db-migrator-tool-image" }, { "id": "@kie-tools/unitables" }, { "id": "pmml-vscode-extension" }, { "id": "@kie-tools/runtime-tools-components" }, @@ -2105,37 +2105,37 @@ "weight": 1 }, { - "source": "@kie/kogito-jit-runner-image", + "source": "@kie-tools/kogito-db-migrator-tool", "target": "@kie-tools/maven-base", "weight": 1 }, { - "source": "@kie/kogito-jit-runner-image", + "source": "@kie-tools/kogito-db-migrator-tool-image", + "target": "@kie-tools/kogito-db-migrator-tool", + "weight": 1 + }, + { + "source": "@kie-tools/kogito-db-migrator-tool-image", "target": "@kie-tools/sonataflow-image-common", "weight": 1 }, { - "source": "@kie/kogito-jobs-service-allinone-image", + "source": "@kie/kogito-jit-runner-image", "target": "@kie-tools/maven-base", "weight": 1 }, { - "source": "@kie/kogito-jobs-service-allinone-image", + "source": "@kie/kogito-jit-runner-image", "target": "@kie-tools/sonataflow-image-common", "weight": 1 }, { - "source": "@kie-tools/kogito-postgresql-db-migrator-tool", + "source": "@kie/kogito-jobs-service-allinone-image", "target": "@kie-tools/maven-base", "weight": 1 }, { - "source": "@kie-tools/kogito-postgresql-db-migrator-tool-image", - "target": "@kie-tools/kogito-postgresql-db-migrator-tool", - "weight": 1 - }, - { - "source": "@kie-tools/kogito-postgresql-db-migrator-tool-image", + "source": "@kie/kogito-jobs-service-allinone-image", "target": "@kie-tools/sonataflow-image-common", "weight": 1 }, @@ -2848,13 +2848,13 @@ ["@kie/kogito-base-builder-image", "packages/kogito-base-builder-image"], ["@kie/kogito-data-index-ephemeral-image", "packages/kogito-data-index-ephemeral-image"], ["@kie/kogito-data-index-postgresql-image", "packages/kogito-data-index-postgresql-image"], + ["@kie-tools/kogito-db-migrator-tool", "packages/kogito-db-migrator-tool"], + ["@kie-tools/kogito-db-migrator-tool-image", "packages/kogito-db-migrator-tool-image"], ["@kie/kogito-jit-runner-image", "packages/kogito-jit-runner-image"], ["@kie/kogito-jobs-service-allinone-image", "packages/kogito-jobs-service-allinone-image"], ["@kie/kogito-jobs-service-ephemeral-image", "packages/kogito-jobs-service-ephemeral-image"], ["@kie/kogito-jobs-service-postgresql-image", "packages/kogito-jobs-service-postgresql-image"], ["@kie-tools/kogito-management-console", "packages/kogito-management-console"], - ["@kie-tools/kogito-postgresql-db-migrator-tool", "packages/kogito-postgresql-db-migrator-tool"], - ["@kie-tools/kogito-postgresql-db-migrator-tool-image", "packages/kogito-postgresql-db-migrator-tool-image"], ["@kie-tools-core/kubernetes-bridge", "packages/kubernetes-bridge"], ["@kie-tools/maven-base", "packages/maven-base"], ["@kie-tools/maven-m2-repo-via-http-image", "packages/maven-m2-repo-via-http-image"],