Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.11.0 #124

Merged
merged 36 commits into from
Mar 3, 2024
Merged

Release 5.11.0 #124

merged 36 commits into from
Mar 3, 2024

Conversation

pbortnik
Copy link
Contributor

No description provided.

miracle8484 and others added 30 commits December 26, 2022 16:58
Merge master to develop #61
* EPMRPP-81362 || Fix security vulnerabilities (#58)

* EPMRPP-81362 || Update gson version to make able jcloud work (#59)

* EPMRPP-82673-exec-jar promote.yml update (added exec jar)

* Merge master to 5.7.5 (#66)

* EPMRPP-80865|| Update bom version

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

* EPMRPP-82673-exec-jar promote.yml update (added exec jar)

---------

Co-authored-by: miracle8484 <[email protected]>
Co-authored-by: reportportal.io <[email protected]>
Co-authored-by: rkukharenka <[email protected]>
Co-authored-by: Ryhor <[email protected]>

* Update version

* EPMRPP-82707 || Add single bucket configuration (#67)

* EPMRPP-82707 || Add single bucket configuration

* EPMRPP-82707 || Refactor according to checkstyle

* EPMRPP-79722 || Replace RuntimeException with checked exception when file is not found in CleanStorageJob (#68)

* Merge master to hotfix/next (#72)

* Release 5.8.0 (#71)

* EPMRPP-81362 || Fix security vulnerabilities (#58)

* EPMRPP-81362 || Update gson version to make able jcloud work (#59)

* Merge master to 5.7.5 (#66)

* EPMRPP-80865|| Update bom version

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

* EPMRPP-82673-exec-jar promote.yml update (added exec jar)

---------

Co-authored-by: miracle8484 <[email protected]>
Co-authored-by: reportportal.io <[email protected]>
Co-authored-by: rkukharenka <[email protected]>
Co-authored-by: Ryhor <[email protected]>

* Update version

* EPMRPP-83538 || Job service version is missing on Login page

* Update version

---------

Co-authored-by: miracle8484 <[email protected]>
Co-authored-by: Ivan Kustau <[email protected]>
Co-authored-by: reportportal.io <[email protected]>
Co-authored-by: rkukharenka <[email protected]>
Co-authored-by: Ryhor <[email protected]>
Co-authored-by: Andrei Piankouski <[email protected]>

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

---------

Co-authored-by: miracle8484 <[email protected]>
Co-authored-by: Ivan Kustau <[email protected]>
Co-authored-by: reportportal.io <[email protected]>
Co-authored-by: rkukharenka <[email protected]>
Co-authored-by: Ryhor <[email protected]>
Co-authored-by: Andrei Piankouski <[email protected]>

* EPRMPP-83651 || Clean storage job out of memory (#74)

* EPMRPP-83651 || Create batching for clean storage job

* EPMRPP-83651 || Refactor CleanStorageJob

* EPMRPP-83651 || Add check for empty attachment_deletion table

* EPMRPP-83651 || Clean attachments list every batch

* EPMRPP-83651 || Add default value for feature flags

* EPMRPP-83651 || Change logic for CleanStorageJob when using multibucket

* EPMRPP-83651 || Fix bug interrupting remove files when bucket is not found

* EPMRPP-83651 || Refactor CodeStyle

* EPMRPP-83098 || Update datastore variables naming (#75)

* Update gradle scripts version

* Remove dockerPrepareEnvironment

---------

Co-authored-by: miracle8484 <[email protected]>
Co-authored-by: Ivan Kustau <[email protected]>
Co-authored-by: rkukharenka <[email protected]>
Co-authored-by: Ryhor <[email protected]>
Co-authored-by: reportportal.io <[email protected]>
Co-authored-by: Andrei Piankouski <[email protected]>
Co-authored-by: Ivan_Kustau <[email protected]>
# Conflicts:
#	.github/workflows/release.yml
#	Dockerfile
#	build.gradle
#	gradle.properties
#	src/main/java/com/epam/reportportal/ServiceJobApplication.java
#	src/main/java/com/epam/reportportal/analyzer/index/IndexerServiceClientImpl.java
#	src/main/java/com/epam/reportportal/config/DataStorageConfig.java
#	src/main/java/com/epam/reportportal/config/rabbit/ProcessingRabbitMqConfiguration.java
#	src/main/java/com/epam/reportportal/jobs/BaseJob.java
#	src/main/java/com/epam/reportportal/jobs/clean/CleanAttachmentJob.java
#	src/main/java/com/epam/reportportal/jobs/clean/CleanLaunchJob.java
#	src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java
#	src/main/java/com/epam/reportportal/jobs/clean/CleanMaterializedViewJob.java
#	src/main/java/com/epam/reportportal/jobs/clean/CleanStorageJob.java
#	src/main/java/com/epam/reportportal/jobs/processing/SaveLogMessageJob.java
#	src/main/java/com/epam/reportportal/jobs/storage/CalculateAllocatedStorageJob.java
#	src/main/java/com/epam/reportportal/storage/S3DataStorageService.java
#	src/main/resources/application.yml
#	src/test/java/com/epam/reportportal/jobs/storage/CalculateAllocatedStorageJobTest.java
…r-es

EPMRPP-86775 || Add possibility to have no auth in ES
* EPMRPP-86812 || show health info detailed by default
* EPMRPP-87272 || Fix DeleteExpiredUsersJob for case when user has no attachments

* EPMRPP-87272 || Move attachments to attachments deletion when user is expired
EPMRPP-79482 || Add JCloud filesystem implementation
* EPMRPP-87382 || delete expired user's photo
* EPMRPP-87601 || Fix deletion for single bucket

* EPMRPP-87601 || Refactor code smell
Copy link

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@pbortnik pbortnik changed the base branch from develop to master March 1, 2024 08:32
…into rc/5.11.0

� Conflicts:
�	.github/workflows/dockerhub-release.yaml
�	.github/workflows/rc.yaml
�	gradle.properties
Copy link

sonarqubecloud bot commented Mar 3, 2024

Quality Gate Passed Quality Gate passed

Issues
4 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
2.2% Duplication on New Code

See analysis details on SonarCloud

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

reviewdog

src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java|35 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java|69 col 9| 'if' child has incorrect indentation level 8, expected level should be 20.
src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java|70 col 9| 'if' has incorrect indentation level 8, expected level should be 20.
src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java|71 col 11| 'if' child has incorrect indentation level 10, expected level should be 22.
src/main/java/com/epam/reportportal/jobs/clean/CleanLogJob.java|72 col 9| 'if rcurly' has incorrect indentation level 8, expected level should be 20.
src/main/java/com/epam/reportportal/jobs/clean/BaseCleanJob.java|20 col 26| Abbreviation in name 'SELECT_PROJECTS_ATTRIBUTES' must contain no more than '1' consecutive capital letters.
src/main/java/com/epam/reportportal/jobs/clean/BaseCleanJob.java|20 col 26| Member name 'SELECT_PROJECTS_ATTRIBUTES' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]$'.
src/main/java/com/epam/reportportal/jobs/clean/BaseCleanJob.java|23| Line is longer than 100 characters (found 119).
src/main/java/com/epam/reportportal/jobs/clean/DeleteExpiredUsersJob.java|56| Line is longer than 100 characters (found 102).
src/main/java/com/epam/reportportal/jobs/clean/DeleteExpiredUsersJob.java|104| Line is longer than 100 characters (found 113).
src/main/java/com/epam/reportportal/jobs/storage/CalculateAllocatedStorageJob.java|56 col 3| All overloaded methods should be placed next to each other. Placing non-overloaded methods in between overloaded methods with the same type is a violation. Previous overloaded method located at line '46'.
src/main/java/com/epam/reportportal/jobs/BaseJob.java|9 col 26| Abbreviation in name 'LOGGER' must contain no more than '1' consecutive capital letters.
src/main/java/com/epam/reportportal/jobs/BaseJob.java|9 col 26| Member name 'LOGGER' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]
$'.
src/main/java/com/epam/reportportal/config/ShedLockConfig.java|20 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/config/DataStorageConfig.java|153 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/config/ExecutorConfig.java|15 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/config/rabbit/AnalyzerRabbitMqConfiguration.java|67 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/config/rabbit/AnalyzerRabbitMqConfiguration.java|75 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/analyzer/RabbitMqManagementClientTemplate.java|44 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/analyzer/RabbitMqManagementClientTemplate.java|51 col 3| Missing a Javadoc comment.
src/main/java/com/epam/reportportal/analyzer/index/IndexerServiceClient.java|27| First sentence of Javadoc is missing an ending period.
src/main/java/com/epam/reportportal/analyzer/index/IndexerServiceClientImpl.java|57| Line is longer than 100 characters (found 116).
src/main/java/com/epam/reportportal/model/index/CleanIndexByDateRangeRq.java|26 col 3| Missing a Javadoc comment.
src/test/java/com/epam/reportportal/jobs/storage/CalculateAllocatedStorageJobTest.java|33| Line is longer than 100 characters (found 109).


private static final String SINGLE_BUCKET_NAME = "store";

public LocalDataStorageService(BlobStore blobStore, FeatureFlagHandler featureFlagHandler,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck> reported by reviewdog 🐶
Missing a Javadoc comment.

* @author <a href="mailto:[email protected]">Maksim Antonov</a>
*/
@Primary
@Service
@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
public class SimpleElasticSearchClient implements ElasticSearchClient {

protected final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticSearchClient.class);
protected final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticSearchClient.class);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck> reported by reviewdog 🐶
Abbreviation in name 'LOGGER' must contain no more than '1' consecutive capital letters.

* @author <a href="mailto:[email protected]">Maksim Antonov</a>
*/
@Primary
@Service
@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
public class SimpleElasticSearchClient implements ElasticSearchClient {

protected final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticSearchClient.class);
protected final Logger LOGGER = LoggerFactory.getLogger(SimpleElasticSearchClient.class);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck> reported by reviewdog 🐶
Member name 'LOGGER' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9]*$'.

@Value("${rp.elasticsearch.password}") String password) {
restTemplate = new RestTemplate();
restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor(username, password));
public SimpleElasticSearchClient(@Value("${rp.elasticsearch.host}") String host,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck> reported by reviewdog 🐶
Missing a Javadoc comment.

this.scheduler = scheduler;
this.scheduledTask = this.scheduler.schedule(this::processAndSchedule, getNextTime());
}
public BatchProcessing(int batchSize, long timeout, TaskScheduler scheduler) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck> reported by reviewdog 🐶
Missing a Javadoc comment.

LOGGER.info("Delete {} launches for project {}", deleted, projectId);
// to avoid error message in analyzer log, doesn't find index
if (deleted > 0) {
indexerServiceClient.removeFromIndexLessThanLaunchDate(projectId, lessThanDate);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'if' child has incorrect indentation level 10, expected level should be 22.

// to avoid error message in analyzer log, doesn't find index
if (deleted > 0) {
indexerServiceClient.removeFromIndexLessThanLaunchDate(projectId, lessThanDate);
LOGGER.info("Send message for deletion to analyzer for project {}", projectId);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'if' child has incorrect indentation level 10, expected level should be 22.


deleteLogsFromElasticsearchByLaunchIdsAndProjectId(launchIds, projectId);
deleteLogsFromElasticsearchByLaunchIdsAndProjectId(launchIds, projectId);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> reported by reviewdog 🐶
'if' child has incorrect indentation level 10, expected level should be 22.


private static final String DELETE_LOGS_QUERY = "DELETE FROM log WHERE project_id = ? AND log_time <= ?::TIMESTAMP;";
private static final String SELECT_LAUNCH_ID_QUERY = "SELECT id FROM launch WHERE project_id = :projectId AND start_time <= :startTime::TIMESTAMP;";
private static final String DELETE_LOGS_QUERY = "DELETE FROM log WHERE project_id = ? AND log_time <= ?::TIMESTAMP;";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> reported by reviewdog 🐶
Line is longer than 100 characters (found 119).

private static final String DELETE_LOGS_QUERY = "DELETE FROM log WHERE project_id = ? AND log_time <= ?::TIMESTAMP;";
private static final String SELECT_LAUNCH_ID_QUERY = "SELECT id FROM launch WHERE project_id = :projectId AND start_time <= :startTime::TIMESTAMP;";
private static final String DELETE_LOGS_QUERY = "DELETE FROM log WHERE project_id = ? AND log_time <= ?::TIMESTAMP;";
private static final String SELECT_LAUNCH_ID_QUERY = "SELECT id FROM launch WHERE project_id = :projectId AND start_time <= :startTime::TIMESTAMP;";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [reviewdog] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> reported by reviewdog 🐶
Line is longer than 100 characters (found 150).

@pbortnik pbortnik merged commit e8c0a06 into master Mar 3, 2024
6 checks passed
@pbortnik pbortnik deleted the rc/5.11.0 branch March 3, 2024 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants