From e083e2e0ff54828b484cf3534330cf8a186e1f24 Mon Sep 17 00:00:00 2001 From: colin-mueller-sonarsource Date: Wed, 4 Nov 2020 09:46:35 +0100 Subject: [PATCH] SONAR-13122 Reduce Log Level of rule indexing warnings on startup --- .../sonar/server/rule/index/RuleIndexer.java | 4 ++-- .../server/rule/index/RuleIndexerTest.java | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndexer.java b/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndexer.java index 63e404a9d37..4a02b3b95ab 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndexer.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndexer.java @@ -148,7 +148,7 @@ public class RuleIndexer implements ResilientIndexer { private static RuleDoc ruleDocOf(RuleForIndexingDto dto) { SecurityStandards securityStandards = SecurityStandards.fromSecurityStandards(dto.getSecurityStandards()); if (!securityStandards.getIgnoredSQCategories().isEmpty()) { - LOG.warn( + LOG.debug( "Rule {} with CWEs '{}' maps to multiple SQ Security Categories: {}", dto.getRuleKey(), String.join(", ", securityStandards.getCwe()), @@ -160,7 +160,7 @@ public class RuleIndexer implements ResilientIndexer { if (dto.getTypeAsRuleType() == RuleType.SECURITY_HOTSPOT) { HotspotRuleDescription ruleDescription = HotspotRuleDescription.from(dto); if (!ruleDescription.isComplete()) { - LOG.warn( + LOG.debug( "Description of Security Hotspot Rule {} can't be fully parsed: What is the risk?={}, Are you vulnerable?={}, How to fix it={}", dto.getRuleKey(), toOkMissing(ruleDescription.getRisk()), toOkMissing(ruleDescription.getVulnerable()), diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java index 21205f37cdf..dc0b9bbd56a 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java @@ -136,7 +136,7 @@ public class RuleIndexerTest { @Test @UseDataProvider("twoDifferentCategoriesButOTHERS") - public void log_a_warning_if_hotspot_rule_maps_to_multiple_SQCategories(SQCategory sqCategory1, SQCategory sqCategory2) { + public void log_debug_if_hotspot_rule_maps_to_multiple_SQCategories(SQCategory sqCategory1, SQCategory sqCategory2) { Set standards = Stream.of(sqCategory1, sqCategory2) .flatMap(t -> CWES_BY_SQ_CATEGORY.get(t).stream().map(e -> "cwe:" + e)) .collect(toSet()); @@ -149,7 +149,7 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Rule %s with CWEs '%s' maps to multiple SQ Security Categories: %s", rule.getKey(), @@ -177,7 +177,7 @@ public class RuleIndexerTest { @Test @UseDataProvider("nullEmptyOrNoTitleDescription") - public void log_a_warning_when_hotspot_rule_description_is_null_or_empty(@Nullable String description) { + public void log_debug_when_hotspot_rule_description_is_null_or_empty(@Nullable String description) { RuleDefinitionDto rule = dbTester.rules().insert(RuleTesting.newRule() .setType(RuleType.SECURITY_HOTSPOT) .setDescription(description)); @@ -185,7 +185,7 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Description of Security Hotspot Rule %s can't be fully parsed: What is the risk?=missing, Are you vulnerable?=missing, How to fix it=missing", rule.getKey())); @@ -200,7 +200,7 @@ public class RuleIndexerTest { } @Test - public void log_a_warning_when_hotspot_rule_description_has_none_of_the_key_titles() { + public void log_debug_when_hotspot_rule_description_has_none_of_the_key_titles() { RuleDefinitionDto rule = dbTester.rules().insert(RuleTesting.newRule() .setType(RuleType.SECURITY_HOTSPOT) .setDescription(randomAlphabetic(30))); @@ -208,14 +208,14 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Description of Security Hotspot Rule %s can't be fully parsed: What is the risk?=ok, Are you vulnerable?=missing, How to fix it=missing", rule.getKey())); } @Test - public void log_a_warning_when_hotspot_rule_description_is_missing_fixIt_tab_content() { + public void log_debug_when_hotspot_rule_description_is_missing_fixIt_tab_content() { RuleDefinitionDto rule = dbTester.rules().insert(RuleTesting.newRule() .setType(RuleType.SECURITY_HOTSPOT) .setDescription("bar\n" + @@ -225,14 +225,14 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Description of Security Hotspot Rule %s can't be fully parsed: What is the risk?=ok, Are you vulnerable?=ok, How to fix it=missing", rule.getKey())); } @Test - public void log_a_warning_when_hotspot_rule_description_is_missing_risk_tab_content() { + public void log_debug_when_hotspot_rule_description_is_missing_risk_tab_content() { RuleDefinitionDto rule = dbTester.rules().insert(RuleTesting.newRule() .setType(RuleType.SECURITY_HOTSPOT) .setDescription("

Ask Yourself Whether

\n" + @@ -243,14 +243,14 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Description of Security Hotspot Rule %s can't be fully parsed: What is the risk?=missing, Are you vulnerable?=ok, How to fix it=ok", rule.getKey())); } @Test - public void log_a_warning_when_hotspot_rule_description_is_missing_vulnerable_tab_content() { + public void log_debug_when_hotspot_rule_description_is_missing_vulnerable_tab_content() { RuleDefinitionDto rule = dbTester.rules().insert(RuleTesting.newRule() .setType(RuleType.SECURITY_HOTSPOT) .setDescription("bar\n" + @@ -260,7 +260,7 @@ public class RuleIndexerTest { underTest.commitAndIndex(dbTester.getSession(), rule.getUuid()); assertThat(logTester.getLogs()).hasSize(1); - assertThat(logTester.logs(LoggerLevel.WARN).get(0)) + assertThat(logTester.logs(LoggerLevel.DEBUG).get(0)) .isEqualTo(format( "Description of Security Hotspot Rule %s can't be fully parsed: What is the risk?=ok, Are you vulnerable?=missing, How to fix it=ok", rule.getKey())); -- 2.39.5