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
apache · Oct 30, 2023 · 6c3029d · 6c3029d
1 parent 6b3d59b
commit 6c3029d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/...-utils/src/main/java/org/kie/kogito/index/test/containers/AbstractDataIndexContainer.java b/...-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 void setKafkaURL(String kafkaURL) {
     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/...kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java b/...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/...kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexPersistenceIT.java b/...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/...t/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java b/...t/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/...t/java/org/kie/kogito/addons/quarkus/data/index/it/PostgreSQLQuarkusAddonDataIndexIT.java b/...t/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))