Merge remote-tracking branch 'origin/release/7.0.0-rev8' into NAE-2169

Author: machacjozef

.github/workflows/master-build.yml

@@ -53,7 +53,7 @@ jobs:
         options: -e="discovery.type=single-node" -e="xpack.security.enabled=false" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10
 
       minio:
-        image: docker.io/bitnami/minio:2022
+        image: docker.io/bawix/minio:2022
         ports:
           - 9000:9000
           - 9001:9001

.github/workflows/pr-build.yml

@@ -52,7 +52,7 @@ jobs:
         options: -e="discovery.type=single-node" -e="xpack.security.enabled=false" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10
 
       minio:
-        image: docker.io/bitnami/minio:2022
+        image: docker.io/bawix/minio:2022
         ports:
           - 9000:9000
           - 9001:9001

.github/workflows/release-build.yml

@@ -64,7 +64,7 @@ jobs:
         options: -e="discovery.type=single-node" -e="xpack.security.enabled=false" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10
 
       minio:
-        image: docker.io/bitnami/minio:2022
+        image: docker.io/bawix/minio:2022
         ports:
           - 9000:9000
           - 9001:9001

application-engine/docker-compose.yml

@@ -39,10 +39,11 @@ services:
     ports:
       - "6379:6379"
   minio:
-    image: docker.io/bitnami/minio:2022
+    image: minio/minio:RELEASE.2022-12-12T19-27-27Z
     ports:
       - '9000:9000'
       - '9001:9001'
+    command: server /data --console-address ":9001"
     networks:
       - minionetwork
     volumes:

application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileFieldTest.groovy

@@ -5,6 +5,8 @@ import com.netgrif.application.engine.ApplicationEngine
 import com.netgrif.application.engine.TestHelper
 import com.netgrif.application.engine.adapter.spring.auth.domain.AuthorityImpl
 import com.netgrif.application.engine.auth.service.UserService
+import com.netgrif.application.engine.files.minio.MinIoHostInfo
+import com.netgrif.application.engine.files.minio.StorageConfigurationProperties
 import com.netgrif.application.engine.importer.service.Importer
 import com.netgrif.application.engine.objects.auth.constants.UserConstants
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser
@@ -21,6 +23,9 @@ import com.netgrif.application.engine.startup.runner.SuperCreatorRunner
 import com.netgrif.application.engine.objects.workflow.domain.Case
 import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService
 import com.netgrif.application.engine.workflow.web.requestbodies.file.FileFieldRequest
+import io.minio.BucketExistsArgs
+import io.minio.MakeBucketArgs
+import io.minio.MinioClient
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -35,7 +40,6 @@ import org.springframework.mock.web.MockHttpServletRequest
 import org.springframework.mock.web.MockMultipartFile
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
-import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors
 import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers
 import org.springframework.security.web.authentication.WebAuthenticationDetails
 import org.springframework.test.context.ActiveProfiles
@@ -66,6 +70,9 @@ class FileFieldTest {
     public static final String USER_EMAIL = "super@netgrif.com"
     public static final String MOCK_FILE_NAME = "hello.txt"
 
+    public static final String BUCKET = "default"
+
+    static MinioClient mc;
 
     @Value('${netgrif.engine.security.auth.admin-password:password}')
     private String userPassword
@@ -94,6 +101,9 @@ class FileFieldTest {
     @Autowired
     private SuperCreatorRunner superCreator
 
+    @Autowired
+    private StorageConfigurationProperties.MinIoStorageProperties MinIoStorageProperties
+
     private MockMvc mockMvc
 
     private ObjectMapper objectMapper
@@ -103,6 +113,19 @@ class FileFieldTest {
     @BeforeEach
     void setup() {
         testHelper.truncateDbs()
+
+        MinIoHostInfo hostInfo = MinIoStorageProperties.getHosts("host_1")
+
+        mc = MinioClient.builder()
+                .endpoint(hostInfo.host)
+                .credentials(hostInfo.user, hostInfo.password)
+                .build();
+
+        boolean exists = mc.bucketExists(BucketExistsArgs.builder().bucket(BUCKET).build());
+        if (!exists) {
+            mc.makeBucket(MakeBucketArgs.builder().bucket(BUCKET).build());
+        }
+
         mockMvc = MockMvcBuilders
                 .webAppContextSetup(context)
                 .apply(SecurityMockMvcConfigurers.springSecurity())

application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileListFieldTest.groovy

@@ -5,6 +5,8 @@ import com.netgrif.application.engine.ApplicationEngine
 import com.netgrif.application.engine.TestHelper
 import com.netgrif.application.engine.adapter.spring.auth.domain.AuthorityImpl
 import com.netgrif.application.engine.auth.service.UserService
+import com.netgrif.application.engine.files.minio.MinIoHostInfo
+import com.netgrif.application.engine.files.minio.StorageConfigurationProperties
 import com.netgrif.application.engine.importer.service.Importer
 import com.netgrif.application.engine.objects.auth.constants.UserConstants
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser
@@ -21,6 +23,9 @@ import com.netgrif.application.engine.startup.ImportHelper
 import com.netgrif.application.engine.startup.runner.SuperCreatorRunner
 import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService
 import com.netgrif.application.engine.workflow.web.requestbodies.file.FileFieldRequest
+import io.minio.BucketExistsArgs
+import io.minio.MakeBucketArgs
+import io.minio.MinioClient
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -64,6 +69,10 @@ class FileListFieldTest {
     public static final String USER_EMAIL = "super@netgrif.com"
     public static final String MOCK_FILE_NAME = "hello.txt"
 
+    public static final String BUCKET = "default"
+
+    static MinioClient mc;
+
     @Value('${netgrif.engine.security.auth.admin-password:password}')
     private String userPassword
 
@@ -97,9 +106,26 @@ class FileListFieldTest {
 
     private Authentication auth
 
+    @Autowired
+    private StorageConfigurationProperties.MinIoStorageProperties MinIoStorageProperties
+
     @BeforeEach
     void setup() {
         testHelper.truncateDbs()
+
+        MinIoHostInfo hostInfo = MinIoStorageProperties.getHosts("host_1")
+
+        mc = MinioClient.builder()
+                .endpoint(hostInfo.host)
+                .credentials(hostInfo.user, hostInfo.password)
+                .build();
+
+        boolean exists = mc.bucketExists(BucketExistsArgs.builder().bucket(BUCKET).build());
+        if (!exists) {
+            mc.makeBucket(MakeBucketArgs.builder().bucket(BUCKET).build());
+        }
+
+
         mockMvc = MockMvcBuilders
                 .webAppContextSetup(context)
                 .apply(SecurityMockMvcConfigurers.springSecurity())