Master merge to 5.7.5 (#1695)

* EPMRPP-79211 || Changed Minio interface to JCloud

* EPMRPP-79211 || Updated DataStore configuration and properties

* EPMRPP-79211 || Updated docker-compose with right BinaryStore value

* EPMRPP-79211 || Update commons dao version

* Update commons dao dependency to 5.7.4

* EPMRPP-80865|| Update bom and other versions (#1663)

5.7.4 || Update bom and other versions

* [Gradle Release Plugin] - new version commit:  '5.7.5'.

---------

Co-authored-by: miracle8484 <76156909+miracle8484@users.noreply.github.com>
Co-authored-by: reportportal.io <support@reportportal.io>

.github/workflows/release.yml

@@ -12,9 +12,9 @@ on:
 env:
   GH_USER_NAME: github.actor
   SCRIPTS_VERSION: 5.7.0
-  BOM_VERSION: 5.7.3
+  BOM_VERSION: 5.7.4
   MIGRATIONS_VERSION: 5.7.3
-  RELEASE_VERSION: 5.7.3
+  RELEASE_VERSION: 5.7.4
   REPOSITORY_URL: 'https://maven.pkg.github.com/'
 
 jobs:

Dockerfile

@@ -1,10 +1,10 @@
 FROM amazoncorretto:11.0.17
-LABEL version=5.7.3 description="EPAM Report portal. Main API Service" maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
+LABEL version=5.7.4 description="EPAM Report portal. Main API Service" maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
 ARG GH_TOKEN
-ARG GH_URL=https://__:$GH_TOKEN@maven.pkg.github.com/reportportal/service-api/com/epam/reportportal/service-api/5.7.3/service-api-5.7.3-exec.jar
+ARG GH_URL=https://__:$GH_TOKEN@maven.pkg.github.com/reportportal/service-api/com/epam/reportportal/service-api/5.7.4/service-api-5.7.4-exec.jar
 RUN curl -O -L $GH_URL \
-    --output service-api-5.7.3-exec.jar && \
-    echo 'exec java ${JAVA_OPTS} -jar service-api-5.7.3-exec.jar' > /start.sh && chmod +x /start.sh
+    --output service-api-5.7.4-exec.jar && \
+    echo 'exec java ${JAVA_OPTS} -jar service-api-5.7.4-exec.jar' > /start.sh && chmod +x /start.sh
 ENV JAVA_OPTS="-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom"
 VOLUME ["/tmp"]
 EXPOSE 8080

gradle.properties

@@ -1,4 +1,4 @@
-version=5.7.4
+version=5.7.5
 description=EPAM Report portal. Main API Service
 dockerPrepareEnvironment=
 dockerJavaOpts=-Xmx1g -XX:+UseG1GC -XX:InitiatingHeapOccupancyPercent=70 -Djava.security.egd=file:/dev/./urandom

src/main/java/com/epam/ta/reportportal/job/FlushingDataJob.java

@@ -31,7 +31,7 @@
 import com.epam.ta.reportportal.util.PersonalProjectService;
 import com.epam.ta.reportportal.ws.converter.builders.UserBuilder;
 import com.epam.ta.reportportal.ws.model.user.CreateUserRQFull;
-import io.minio.MinioClient;
+import org.jclouds.blobstore.BlobStore;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
@@ -83,7 +83,7 @@ public class FlushingDataJob implements Job {
 	private UserBinaryDataService dataStore;
 
 	@Autowired
-	private MinioClient minioClient;
+	private BlobStore blobStore;
 
 	@Autowired
 	private PasswordEncoder passwordEncoder;
@@ -163,7 +163,7 @@ private void deleteProject(Project project) {
 		analyzerServiceClient.removeSuggest(project.getId());
 		issueTypeRepository.deleteAll(issueTypesToRemove);
 		try {
-			minioClient.removeBucket(bucketPrefix + project.getId());
+			blobStore.deleteContainer(bucketPrefix + project.getId());
 		} catch (Exception e) {
 			LOGGER.warn("Cannot delete attachments bucket " + bucketPrefix + project.getId());
 		}

src/main/resources/application.properties

@@ -37,13 +37,19 @@ com.ta.reportportal.job.clean.bids.cron=PT1H
 spring.jooq.sql-dialect=POSTGRES
 
 datastore.default.path=\${rp.binarystore.path:/data/storage}
+datastore.s3.endpoint=\${rp.binarystore.s3.endpoint:https://play.min.io}
+datastore.s3.accessKey=\${rp.binarystore.s3.accessKey:Q3AM3UQ867SPQQA43P2F}
+datastore.s3.secretKey=\${rp.binarystore.s3.secretKey:zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG}
+datastore.s3.region=\${rp.binarystore.s3.region:#{null}}
+datastore.s3.bucketPrefix=\${rp.binarystore.s3.bucketPrefix:prj-}
+datastore.s3.defaultBucketName=\${rp.binarystore.s3.defaultBucketName:rp-bucket}
 datastore.minio.endpoint=\${rp.binarystore.minio.endpoint:https://play.min.io}
 datastore.minio.accessKey=\${rp.binarystore.minio.accessKey:Q3AM3UQ867SPQQA43P2F}
 datastore.minio.secretKey=\${rp.binarystore.minio.secretKey:zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG}
 datastore.minio.region=\${rp.binarystore.minio.region:#{null}}
 datastore.minio.bucketPrefix=\${rp.binarystore.minio.bucketPrefix:prj-}
 datastore.minio.defaultBucketName=\${rp.binarystore.minio.defaultBucketName:rp-bucket}
-# could be one of [filesystem, minio]
+# could be one of [filesystem, minio, s3]
 datastore.type=\${rp.binarystore.type:filesystem}
 datastore.thumbnail.attachment.width=\${rp.binarystore.thumbnail.attachment.width:80}
 datastore.thumbnail.attachment.height=\${rp.binarystore.thumbnail.attachment.height:60}

src/main/resources/application.yaml

@@ -169,7 +169,7 @@ rp:
       secretKey:
       bucketPrefix: prj-
       defaultBucketName: rp-bucket
-    # could be one of [filesystem, minio]
+    # could be one of [filesystem, minio, s3]
     type: filesystem
     thumbnail:
       attachment: