Improve coverage: Adding tests for ConfigurationRepository class (#5206)

Signed-off-by: shikharj05 <8859327+shikharj05@users.noreply.github.com>
Signed-off-by: Shikhar Jain <8859327+shikharj05@users.noreply.github.com>

Author: shikharj05

build.gradle

@@ -249,37 +249,6 @@ task listTasksAsJSON {
     }
 }
 
-test {
-    include '**/*.class'
-    filter {
-        excludeTestsMatching "org.opensearch.security.sanity.tests.*"
-    }
-    maxParallelForks = 8
-    jvmArgs += "-Xmx3072m"
-    // this is needed to reflect access system env map.
-    jvmArgs += "--add-opens=java.base/java.io=ALL-UNNAMED"
-    jvmArgs += "--add-opens=java.base/java.util=ALL-UNNAMED"
-    retry {
-        failOnPassedAfterRetry = false
-        maxRetries = 5
-    }
-    jacoco {
-        excludes = [
-                "com.sun.jndi.dns.*",
-                "com.sun.security.sasl.gsskerb.*",
-                "java.sql.*",
-                "javax.script.*",
-                "org.jcp.xml.dsig.internal.dom.*",
-                "sun.nio.cs.ext.*",
-                "sun.security.ec.*",
-                "sun.security.jgss.*",
-                "sun.security.pkcs11.*",
-                "sun.security.smartcardio.*",
-                "sun.util.resources.provider.*"
-        ]
-    }
-}
-
 task copyExtraTestResources(dependsOn: testClasses) {
 
     copy {
@@ -329,6 +298,38 @@ def setCommonTestConfig(Test task) {
     task.finalizedBy jacocoTestReport
 }
 
+test {
+    include '**/*.class'
+    filter {
+        excludeTestsMatching "org.opensearch.security.sanity.tests.*"
+    }
+    maxParallelForks = 8
+    jvmArgs += "-Xmx3072m"
+    // this is needed to reflect access system env map.
+    jvmArgs += "--add-opens=java.base/java.io=ALL-UNNAMED"
+    jvmArgs += "--add-opens=java.base/java.util=ALL-UNNAMED"
+    retry {
+        failOnPassedAfterRetry = false
+        maxRetries = 5
+    }
+    jacoco {
+        excludes = [
+                "com.sun.jndi.dns.*",
+                "com.sun.security.sasl.gsskerb.*",
+                "java.sql.*",
+                "javax.script.*",
+                "org.jcp.xml.dsig.internal.dom.*",
+                "sun.nio.cs.ext.*",
+                "sun.security.ec.*",
+                "sun.security.jgss.*",
+                "sun.security.pkcs11.*",
+                "sun.security.smartcardio.*",
+                "sun.util.resources.provider.*"
+        ]
+    }
+    setCommonTestConfig(it)
+}
+
 task citest(type: Test) {
     group = "Github Actions tests"
     description = "Runs the test suite on classes not covered by rest of the task in this group."

src/main/java/org/opensearch/security/compliance/ComplianceConfig.java

@@ -283,7 +283,7 @@ public static ComplianceConfig from(Settings settings) {
     /**
      * Create compliance configuration from Settings defined in opensearch.yml
      * @param settings settings
-     * @param dateProvider how the current date/time is evalated for audit logs that rollover
+     * @param dateProvider how the current date/time is evaluated for audit logs that rollover
      * @return compliance configuration
      */
     public static ComplianceConfig from(Settings settings, Supplier<DateTime> dateProvider) {

src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java

@@ -128,7 +128,8 @@ protected ConfigurationRepository(
         final Client client,
         final ClusterService clusterService,
         final AuditLog auditLog,
-        final SecurityIndexHandler securityIndexHandler
+        final SecurityIndexHandler securityIndexHandler,
+        final ConfigurationLoaderSecurity7 configurationLoaderSecurity7
     ) {
         this.securityIndex = securityIndex;
         this.settings = settings;
@@ -139,7 +140,7 @@ protected ConfigurationRepository(
         this.auditLog = auditLog;
         this.configurationChangedListener = new ArrayList<>();
         this.acceptInvalid = settings.getAsBoolean(ConfigConstants.SECURITY_UNSUPPORTED_ACCEPT_INVALID_CONFIG, false);
-        cl = new ConfigurationLoaderSecurity7(client, threadPool, settings, clusterService);
+        this.cl = configurationLoaderSecurity7;
         configCache = CacheBuilder.newBuilder().build();
         this.securityIndexHandler = securityIndexHandler;
     }
@@ -177,8 +178,8 @@ private boolean nodeSelectedAsManager(final ClusterChangedEvent event) {
     public String getConfigDirectory() {
         String lookupDir = System.getProperty("security.default_init.dir");
         final String cd = lookupDir != null
-            ? (lookupDir + "/")
-            : new Environment(settings, configPath).configDir().toAbsolutePath().toString() + "/opensearch-security/";
+            ? (lookupDir + File.separator)
+            : new Environment(settings, configPath).configDir().toAbsolutePath().resolve("opensearch-security").toString() + File.separator;
         return cd;
     }
 
@@ -496,7 +497,8 @@ public static ConfigurationRepository create(
             client,
             clusterService,
             auditLog,
-            new SecurityIndexHandler(securityIndex, settings, client)
+            new SecurityIndexHandler(securityIndex, settings, client),
+            new ConfigurationLoaderSecurity7(client, threadPool, settings, clusterService)
         );
     }
 

src/main/java/org/opensearch/security/securityconf/DynamicConfigFactory.java

@@ -294,7 +294,7 @@ private static ConfigV7 getConfigV7(SecurityDynamicConfiguration<?> sdc) {
     }
 
     @Override
-    public final boolean isInitialized() {
+    public boolean isInitialized() {
         return initialized.get();
     }