This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 6c3029d32 KOGITO-9855: Avoid create protobuf folder with root
privileges. Fix p… (#1891)
6c3029d32 is described below
commit 6c3029d327fc88c99f5494d80e53d59451371f90
Author: nmirasch <[email protected]>
AuthorDate: Mon Oct 30 14:29:49 2023 +0100
KOGITO-9855: Avoid create protobuf folder with root privileges. Fix p…
(#1891)
* KOGITO-9855: Avoid create protobuf folder with root privileges. Fix
postgresql Dataindex addons integration test reusing testcontainers
* review suggestion applied
---
.../test/containers/AbstractDataIndexContainer.java | 16 ++++++++++++++++
.../it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java | 4 +++-
.../it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java | 4 +++-
.../data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java | 4 +++-
.../data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java | 4 +++-
5 files changed, 28 insertions(+), 4 deletions(-)
diff --git
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
index d20debfb5..efb814723 100644
---
a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
+++
b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java
@@ -19,6 +19,11 @@
package org.kie.kogito.index.test.containers;
import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import org.kie.kogito.test.resources.TestResource;
import org.kie.kogito.testcontainers.KogitoGenericContainer;
@@ -48,9 +53,20 @@ public abstract class AbstractDataIndexContainer extends
KogitoGenericContainer<
public void addProtoFileFolder() {
String pathStr =
"target/classes/META-INF/resources/persistence/protobuf/";
String absolutePath = new File(pathStr).getAbsolutePath();
+ createIfNotExists(absolutePath);
withFileSystemBind(absolutePath, "/home/kogito/data/protobufs/",
BindMode.READ_ONLY);
}
+ public Path createIfNotExists(String absolutePath) {
+ Path path = Paths.get(absolutePath);
+ try {
+ Files.createDirectories(path);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ return path;
+ }
+
@Override
public int getMappedPort() {
return getMappedPort(PORT);
diff --git
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersi
[...]
index 634950ab7..0cb34d330 100644
---
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
+++
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
@@ -51,9 +51,11 @@ class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
@Test
void testDataIndexAddon() {
+ String processDefId = "hello";
given().contentType(ContentType.JSON)
.baseUri(dataIndex)
- .body("{ \"query\" : \"{ ProcessDefinitions{ id, name,
version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata {
UniqueId } } } }\" }")
+ .body("{ \"query\" : \"{ ProcessDefinitions (where: { id:
{equal: \\\"" + processDefId
+ + "\\\"}}){ id, name, version, endpoint, addons,
source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
.when().post("/graphql")
.then().log().ifValidationFails().statusCode(200)
.body("data.ProcessDefinitions[0].id", is("hello"))
diff --git
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
index 57a1f90b2..4c73225a9 100644
---
a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
+++
b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java
@@ -52,9 +52,11 @@ class PostgreSQLQuarkusAddonDataIndexPersistenceIT {
@Test
void testDataIndexAddon() {
+ String processDefId = "greet";
String source = given().contentType(ContentType.JSON)
.baseUri(dataIndex)
- .body("{ \"query\" : \"{ ProcessDefinitions{ id, name,
version, endpoint, addons, source, nodes { id, name, type, uniqueId, metadata {
UniqueId } } } }\" }")
+ .body("{ \"query\" : \"{ ProcessDefinitions(where: { id:
{equal: \\\"" + processDefId
+ + "\\\"}}){ id, name, version, endpoint, addons,
source, nodes { id, name, type, uniqueId, metadata { UniqueId } } } }\" }")
.when().post("/graphql")
.then().log().ifValidationFails().statusCode(200)
.body("data.ProcessDefinitions[0].id", is("greet"))
diff --git
a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
index 34af65ea3..0ad49c47b 100644
---
a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
+++
b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
@@ -38,7 +38,9 @@ class PostgreSQLQuarkusAddonDataIndexIT {
@Test
void testDataIndexAddon() {
- given().contentType(ContentType.JSON).body("{ \"query\" :
\"{ProcessDefinitions{ id, version, name } }\" }")
+ String processDefId = "hello";
+ given().contentType(ContentType.JSON).body("{ \"query\" :
\"{ProcessDefinitions(where: { id: {equal: \\\"" + processDefId +
+ "\\\"}}){ id, version, name } }\" }")
.when().post("/graphql")
.then().statusCode(200)
.body("data.ProcessDefinitions.size()", is(1))
diff --git
a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
index d2e3e6f6c..7259a80f5 100644
---
a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
+++
b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-sw/src/test/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java
@@ -39,7 +39,9 @@ class PostgreSQLQuarkusAddonDataIndexIT {
@Test
void testDataIndexAddon() {
- given().contentType(ContentType.JSON).body("{ \"query\" :
\"{ProcessDefinitions{ id, version, name } }\" }")
+ String processDefId = "greet";
+ given().contentType(ContentType.JSON).body("{ \"query\" :
\"{ProcessDefinitions(where: { id: {equal: \\\"" + processDefId +
+ "\\\"}}){ id, version, name } }\" }")
.when().post("/graphql")
.then().statusCode(200)
.body("data.ProcessDefinitions.size()", is(1))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
