From 8f4ec9d9a1be55fb2194eb5a101d37ed60cf79fd Mon Sep 17 00:00:00 2001 From: HoussemNasri Date: Sun, 18 Feb 2024 18:03:17 +0100 Subject: [PATCH] Rename 'openSUSE_LEAP_MICRO' to 'LEAP_MICRO' - Having enums starting with a capital letter is better for consistency --- java/code/src/com/redhat/rhn/domain/server/Server.java | 2 +- java/code/src/com/suse/oval/OVALCleaner.java | 2 +- java/code/src/com/suse/oval/OsFamily.java | 2 +- java/code/src/com/suse/oval/config/test/OVALConfigTest.java | 4 ++++ java/code/src/com/suse/oval/config/test/oval.config.json | 2 +- .../SUSEVulnerablePackageExtractor.java | 4 ++-- .../vulnerablepkgextractor/VulnerablePackagesExtractors.java | 2 +- susemanager-sync-data/oval.config.json | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 50ea4507e81c..f1bbb74a10b7 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -2524,7 +2524,7 @@ else if (isSLES() && OsFamily.SUSE_LINUX_ENTERPRISE_SERVER.isSupportedRelease(ge else if (isSLED() && OsFamily.SUSE_LINUX_ENTERPRISE_DESKTOP.isSupportedRelease(getRelease())) { return Optional.of(new CVEAuditManagerOVAL.OVALProduct(OsFamily.SUSE_LINUX_ENTERPRISE_DESKTOP, getRelease())); } - else if (isLeapMicro() && OsFamily.openSUSE_LEAP_MICRO.isSupportedRelease(getRelease())) { + else if (isLeapMicro() && OsFamily.LEAP_MICRO.isSupportedRelease(getRelease())) { return Optional.of(new CVEAuditManagerOVAL.OVALProduct(OsFamily.SUSE_LINUX_ENTERPRISE_MICRO, getRelease())); } else if (isSLEMicro() && OsFamily.SUSE_LINUX_ENTERPRISE_MICRO.isSupportedRelease(getRelease())) { diff --git a/java/code/src/com/suse/oval/OVALCleaner.java b/java/code/src/com/suse/oval/OVALCleaner.java index fe2e607f3365..2627b935cefb 100644 --- a/java/code/src/com/suse/oval/OVALCleaner.java +++ b/java/code/src/com/suse/oval/OVALCleaner.java @@ -86,7 +86,7 @@ private static void fillCves(DefinitionType definition, OsFamily osFamily) { switch (osFamily) { case REDHAT_ENTERPRISE_LINUX: case LEAP: - case openSUSE_LEAP_MICRO: + case LEAP_MICRO: case SUSE_LINUX_ENTERPRISE_SERVER: case SUSE_LINUX_ENTERPRISE_DESKTOP: case SUSE_LINUX_ENTERPRISE_MICRO: diff --git a/java/code/src/com/suse/oval/OsFamily.java b/java/code/src/com/suse/oval/OsFamily.java index a60880570d05..1cd51bc427d3 100644 --- a/java/code/src/com/suse/oval/OsFamily.java +++ b/java/code/src/com/suse/oval/OsFamily.java @@ -22,7 +22,7 @@ public enum OsFamily { LEAP("openSUSE Leap", "leap", "opensuse", oneOf("15.2", "15.3", "15.4", "15.5")), - openSUSE_LEAP_MICRO("openSUSELeap Micro", "leap-micro", "opensuse", + LEAP_MICRO("openSUSELeap Micro", "leap-micro", "opensuse", oneOf("5.2", "5.3")), SUSE_LINUX_ENTERPRISE_SERVER("SUSE Linux Enterprise Server", "sles", "suse", oneOf("11", "12", "15")), diff --git a/java/code/src/com/suse/oval/config/test/OVALConfigTest.java b/java/code/src/com/suse/oval/config/test/OVALConfigTest.java index 5ed8717eeb6b..99e53a531a8c 100644 --- a/java/code/src/com/suse/oval/config/test/OVALConfigTest.java +++ b/java/code/src/com/suse/oval/config/test/OVALConfigTest.java @@ -99,4 +99,8 @@ public void testAllSources() throws IOException { assertEquals(HttpURLConnection.HTTP_OK, responseCode, () -> "Can't connect to URL: " + sourceURL); } } + + public void testOsFamilies() { + // TODO: Test that all os families in the config file are in OsFamily enum + } } diff --git a/java/code/src/com/suse/oval/config/test/oval.config.json b/java/code/src/com/suse/oval/config/test/oval.config.json index aa07f185588e..ba012b8f3460 100644 --- a/java/code/src/com/suse/oval/config/test/oval.config.json +++ b/java/code/src/com/suse/oval/config/test/oval.config.json @@ -20,7 +20,7 @@ } } }, - "openSUSE_LEAP_MICRO": { + "LEAP_MICRO": { "content": { "5.2": { "vulnerability": "https://ftp.suse.com/pub/projects/security/oval/opensuse.leap.micro.5.2-affected.xml.gz", diff --git a/java/code/src/com/suse/oval/vulnerablepkgextractor/SUSEVulnerablePackageExtractor.java b/java/code/src/com/suse/oval/vulnerablepkgextractor/SUSEVulnerablePackageExtractor.java index cd87422e22a6..664d31592879 100644 --- a/java/code/src/com/suse/oval/vulnerablepkgextractor/SUSEVulnerablePackageExtractor.java +++ b/java/code/src/com/suse/oval/vulnerablepkgextractor/SUSEVulnerablePackageExtractor.java @@ -173,7 +173,7 @@ private Cpe deriveCpe(TestType productTest) { if (osProduct == OsFamily.LEAP) { return deriveOpenSUSELeapCpe(); } - else if (osProduct == OsFamily.openSUSE_LEAP_MICRO) { + else if (osProduct == OsFamily.LEAP_MICRO) { return deriveOpenSUSELeapMicroCpe(); } else if (osProduct == OsFamily.SUSE_LINUX_ENTERPRISE_MICRO) { @@ -250,7 +250,7 @@ private Cpe deriveFromProductOVALTest(TestType productTest) { public boolean isValidDefinition(DefinitionType definitionTypeIn) { OsFamily osFamily = definitionTypeIn.getOsFamily(); boolean definitionFromASupportedFamily = osFamily == OsFamily.LEAP || - osFamily == OsFamily.openSUSE_LEAP_MICRO || + osFamily == OsFamily.LEAP_MICRO || osFamily == OsFamily.SUSE_LINUX_ENTERPRISE_SERVER || osFamily == OsFamily.SUSE_LINUX_ENTERPRISE_DESKTOP || osFamily == OsFamily.SUSE_LINUX_ENTERPRISE_MICRO; diff --git a/java/code/src/com/suse/oval/vulnerablepkgextractor/VulnerablePackagesExtractors.java b/java/code/src/com/suse/oval/vulnerablepkgextractor/VulnerablePackagesExtractors.java index 6a6cb2c0e5f1..6dcf1d29939f 100644 --- a/java/code/src/com/suse/oval/vulnerablepkgextractor/VulnerablePackagesExtractors.java +++ b/java/code/src/com/suse/oval/vulnerablepkgextractor/VulnerablePackagesExtractors.java @@ -41,7 +41,7 @@ public static VulnerablePackagesExtractor create(DefinitionType definition, OsFa OVALLookupHelper ovalLookupHelper) { switch (osFamily) { case LEAP: - case openSUSE_LEAP_MICRO: + case LEAP_MICRO: case SUSE_LINUX_ENTERPRISE_SERVER: case SUSE_LINUX_ENTERPRISE_DESKTOP: case SUSE_LINUX_ENTERPRISE_MICRO: diff --git a/susemanager-sync-data/oval.config.json b/susemanager-sync-data/oval.config.json index a80fc7971dee..34e6ce6a8838 100644 --- a/susemanager-sync-data/oval.config.json +++ b/susemanager-sync-data/oval.config.json @@ -20,7 +20,7 @@ } } }, - "openSUSE_LEAP_MICRO": { + "LEAP_MICRO": { "content": { "5.2": { "vulnerability": "https://ftp.suse.com/pub/projects/security/oval/opensuse.leap.micro.5.2-affected.xml.gz",