From 6bfc5d0d147f11c4c3f9b7ae2800e1182fdcd5ba Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Thu, 5 Jun 2025 11:52:34 -0500 Subject: [PATCH 1/3] fix: correct typos in compliance report status values --- CHANGELOG.md | 12 +++-------- .../compliance/enums/ComplianceStatus.java | 4 ++-- .../UtmComplianceReportConfigService.java | 11 ++-------- ...ate_typos_config_report_status _values.xml | 21 +++++++++++++++++++ version.yml | 2 +- 5 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 506eaf848..39a741a56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,4 @@ -# UTMStack 10.8.1 Release Notes +# UTMStack 10.8.2 Release Notes -- Improved log parsing and processing for AWS, O365, and Sophos Central integrations. -- Updated Sophos XG integration from legacy mode to support newer versions -- Enhanced log processing and parsing for Windows Agent on ARM architectures. -- Added support for new log channels using the Windows API to retrieve additional logs. -- Compliance Report Scheduling: Improved the stability of the selection process when creating new report schedules. -- Improved field rendering in Log Explorer by consolidating list-based fields into a single entry for better readability and consistency. -- Improved field rendering for tags and note fields in Alerts. -- Improved export functionality to better handle large data sets and avoid performance issues during report generation. \ No newline at end of file +-- Fixed typo in compliance report status values. +-- Standardized internal compliance status labels to ensure consistency across reports and filters. \ No newline at end of file diff --git a/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStatus.java b/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStatus.java index 36bfe48c9..ada106e60 100644 --- a/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStatus.java +++ b/backend/src/main/java/com/park/utmstack/domain/compliance/enums/ComplianceStatus.java @@ -1,5 +1,5 @@ package com.park.utmstack.domain.compliance.enums; public enum ComplianceStatus { - COMPLAINT, - NON_COMPLAINT + COMPLIANT, + NON_COMPLIANT } diff --git a/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigService.java b/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigService.java index 1b50d0542..b201fd0a2 100644 --- a/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigService.java +++ b/backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigService.java @@ -9,33 +9,26 @@ import com.park.utmstack.domain.compliance.UtmComplianceStandard; import com.park.utmstack.domain.compliance.UtmComplianceStandardSection; import com.park.utmstack.domain.compliance.enums.ComplianceStatus; -import com.park.utmstack.domain.index_pattern.UtmIndexPattern; import com.park.utmstack.repository.compliance.UtmComplianceReportConfigRepository; import com.park.utmstack.service.chart_builder.UtmDashboardService; import com.park.utmstack.service.chart_builder.UtmDashboardVisualizationService; import com.park.utmstack.service.elasticsearch.ElasticsearchService; -import com.park.utmstack.service.elasticsearch.SearchUtil; import com.park.utmstack.service.index_pattern.UtmIndexPatternService; -import com.park.utmstack.util.UtilPagination; import com.park.utmstack.util.chart_builder.elasticsearch_dsl.requests.RequestDsl; import com.park.utmstack.util.exceptions.UtmElasticsearchException; import org.opensearch.client.opensearch.core.SearchResponse; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; import javax.persistence.EntityManager; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.stream.Collectors; @Service public class UtmComplianceReportConfigService { @@ -196,9 +189,9 @@ private ComplianceStatus getStatus(UtmDashboard dashboard) throws UtmElasticsear if(Objects.nonNull(visualization)){ RequestDsl requestQuery = new RequestDsl(visualization); SearchResponse result = elasticsearchService.search(requestQuery.getSearchSourceBuilderForCount().build(), ObjectNode.class); - return result.hits().total().value() > 0 ? ComplianceStatus.COMPLAINT : ComplianceStatus.NON_COMPLAINT; + return result.hits().total().value() > 0 ? ComplianceStatus.COMPLIANT : ComplianceStatus.NON_COMPLIANT; } else { - return ComplianceStatus.NON_COMPLAINT; + return ComplianceStatus.NON_COMPLIANT; } } } diff --git a/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml b/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml new file mode 100644 index 000000000..11e7904d8 --- /dev/null +++ b/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml @@ -0,0 +1,21 @@ + + + + + Fix typos in config_report_status values + + UPDATE utm_compliance_report_config + SET config_report_status = 'COMPLIANT' + WHERE config_report_status = 'COMPLAINT'; + + + UPDATE utm_compliance_report_config + SET config_report_status = 'NON_COMPLIANT' + WHERE config_report_status = 'NON_COMPLAINT'; + + + + diff --git a/version.yml b/version.yml index 66ac3d66b..d070c6795 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: 10.8.1 \ No newline at end of file +version: 10.8.2 \ No newline at end of file From 3753217f6dfa3af76de1d982f1764921f461ce83 Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Thu, 5 Jun 2025 11:53:48 -0500 Subject: [PATCH 2/3] fix: correct typos in compliance report status values --- backend/src/main/resources/config/liquibase/master.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/resources/config/liquibase/master.xml b/backend/src/main/resources/config/liquibase/master.xml index 37ee950fb..ec2ce533d 100644 --- a/backend/src/main/resources/config/liquibase/master.xml +++ b/backend/src/main/resources/config/liquibase/master.xml @@ -105,4 +105,7 @@ + + + From 12231d40169ed3f4fdbd19eebbede232a22fdcd5 Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Thu, 5 Jun 2025 11:54:50 -0500 Subject: [PATCH 3/3] fix: correct typos in compliance report status values --- .../20250605001_update_typos_config_report_status _values.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml b/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml index 11e7904d8..16474dcf0 100644 --- a/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml +++ b/backend/src/main/resources/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml @@ -5,7 +5,6 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> - Fix typos in config_report_status values UPDATE utm_compliance_report_config SET config_report_status = 'COMPLIANT'