load from configmap if available

Author: dwasinge

src/main/java/com/redhat/labs/omp/service/ConfigService.java

@@ -1,5 +1,9 @@
 package com.redhat.labs.omp.service;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -25,31 +29,40 @@ public class ConfigService {
 
     @ConfigProperty(name = "config.file")
     String configFile;
-    
+
     @ConfigProperty(name = "webhook.file")
     String webHooksFile;
 
     @ConfigProperty(name = "config.repository.id", defaultValue = "9407")
     String configRepositoryId;
-    
+
     @ConfigProperty(name = "config.gitlab.ref", defaultValue = "master")
     String gitRef;
-    
+
     List<HookConfig> hookConfigList;
+    File configuration;
 
     @Inject
     FileService fileService;
-    
+
     @Inject
     JsonMarshaller marshaller;
-    
+
     void onStart(@Observes StartupEvent event) {
         hookConfigList = marshaller.fromYamlFile(webHooksFile, HookConfig.class);
         LOGGER.debug("Hook Config List {}", hookConfigList);
+        String content = readFile(configFile);
+        if (null != content) {
+            configuration = File.builder().filePath(configFile).content(content).build();
+        }
     }
 
     public File getConfigFile() {
 
+        if (null != configuration) {
+            return configuration;
+        }
+
         Optional<File> optional = fileService.getFile(configRepositoryId, configFile, gitRef);
 
         if (!optional.isPresent()) {
@@ -58,25 +71,42 @@ public File getConfigFile() {
 
         return optional.get();
     }
-    
+
     public List<HookConfig> getHookConfig() {
 
-        if(hookConfigList != null) {
+        if (hookConfigList != null) {
             return hookConfigList;
         }
-        
+
         String gitLabHookFile = webHooksFile.charAt(0) == '/' ? webHooksFile.substring(1) : webHooksFile;
         Optional<File> optional = fileService.getFile(configRepositoryId, gitLabHookFile, gitRef);
 
         if (!optional.isPresent()) {
             LOGGER.error("No webhook file could be found. This is abnormal but not a deal breaker");
             return new ArrayList<>();
         }
-        
+
         File file = optional.get();
-       
+
         return marshaller.fromYaml(file.getContent(), HookConfig.class);
-        
+
+    }
+
+    private String readFile(String file) {
+
+        Path path = Paths.get(file);
+
+        if (Files.isReadable(path)) {
+            LOGGER.debug("Loading config file {}", file);
+            try {
+                return new String(Files.readAllBytes(path));
+            } catch (IOException e) {
+                LOGGER.error(String.format("Found but unable to read file %s", file), e);
+            }
+        }
+
+        return null;
+
     }
 
 }

src/test/java/com/redhat/labs/omp/service/ConfigServiceTest.java

@@ -11,12 +11,48 @@
 import com.redhat.labs.exception.FileNotFoundException;
 import com.redhat.labs.omp.config.JsonMarshaller;
 import com.redhat.labs.omp.mocks.MockGitLabService;
+import com.redhat.labs.omp.models.gitlab.File;
 import com.redhat.labs.omp.models.gitlab.HookConfig;
+import com.redhat.labs.utils.ResourceLoader;
 
 import io.quarkus.runtime.StartupEvent;
 
 class ConfigServiceTest {
-    
+
+    @Test void testGetConfigFilePreLoaded() {
+        ConfigService service = new ConfigService();
+        service.configFile = "src/test/resources/config.yml";
+        service.webHooksFile = "src/test/resources/webhooks.yaml";
+        service.marshaller = new JsonMarshaller();
+        
+        service.onStart(new StartupEvent());
+        File config = service.getConfigFile();
+
+        assertNotNull(config);
+        assertEquals("src/test/resources/config.yml", config.getFilePath());
+        assertEquals(ResourceLoader.load("config.yml"), config.getContent());
+
+    }
+
+    @Test void testGetConfigFileFromGitLab() {
+        ConfigService service = new ConfigService();
+        service.configFile = "schema/config.yml";
+        service.webHooksFile = "src/test/resources/webhooks.yaml";
+        service.marshaller = new JsonMarshaller();
+
+        FileService fileService = new FileService();
+        fileService.gitLabService = new MockGitLabService();
+        service.fileService = fileService;
+
+        service.onStart(new StartupEvent());
+        File config = service.getConfigFile();
+
+        assertNotNull(config);
+        assertEquals("schema/config.yml", config.getFilePath());
+        assertEquals(ResourceLoader.load("config.yml"), config.getContent());
+
+    }
+
     @Test void testGetConfigFileNotFound() {
         ConfigService service = new ConfigService();
         service.configFile = "schema/notfound.yaml";
@@ -34,6 +70,7 @@ class ConfigServiceTest {
 
     @Test void testGetHookConfigPreLoaded() {
         ConfigService service = new ConfigService();
+        service.configFile = "src/test/resources/config.yml";
         service.webHooksFile = "src/test/resources/webhooks.yaml";
         service.marshaller = new JsonMarshaller();
 
@@ -48,6 +85,7 @@ class ConfigServiceTest {
 
     @Test void testGetHookConfigLabNotEmpty() {
         ConfigService service = new ConfigService();
+        service.configFile = "src/test/resources/config.yml";
         service.webHooksFile = "/schema/webhooks.yaml";
         service.marshaller = new JsonMarshaller();
 
@@ -65,6 +103,7 @@ class ConfigServiceTest {
 
     @Test void testGetHookConfigLabsEmpty() {
         ConfigService service = new ConfigService();
+        service.configFile = "src/test/resources/config.yml";
         service.webHooksFile = "schema/notfound.yaml";
         service.marshaller = new JsonMarshaller();