changing directory and file names for config

Author: dwasinge

deployment/templates/configmap-config.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.development }}
 apiVersion: v1
 data:
-  config.yml: |
+  lodestar-runtime-config.yaml: |
    ---
    basic_information:
      project_name:
@@ -74,5 +74,5 @@ data:
      env_grace_period_max: 180
 kind: ConfigMap
 metadata:
-  name: config-cm
+  name: lodestar-runtime-cm
 {{- end }}

deployment/templates/deploymentconfig.yaml

@@ -46,9 +46,9 @@ spec:
         - name: hook-cm-volume
           mountPath: {{ .Values.config.hookFile.path }}/{{ .Values.config.hookFile.name }}
           subPath: {{ .Values.config.hookFile.name }}
-        - name: config-cm-volume
-          mountPath: {{ .Values.config.configFile.path }}/{{ .Values.config.configFile.name }}
-          subPath: {{ .Values.config.configFile.name }}
+        - name: lodestar-runtime-cm-volume
+          mountPath: {{ .Values.config.runtimeConfigFile.path }}/{{ .Values.config.runtimeConfigFile.name }}
+          subPath: {{ .Values.config.runtimeConfigFile.name }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
@@ -58,9 +58,9 @@ spec:
       - name: hook-cm-volume
         configMap:
           name: hook-cm
-      - name: config-cm-volume
+      - name: lodestar-runtime-cm-volume
         configMap:
-          name: config-cm
+          name: lodestar-runtime-cm
   test: false
   triggers:
   - type: ConfigChange

deployment/templates/gitlab-secret.yaml

@@ -5,7 +5,6 @@ metadata:
   name: omp-gitlab-configuration
 type: Opaque
 stringData:
-  CONFIG_FILE: "{{ .Values.configFile }}"
   CONFIG_REPOSITORY_ID: "{{ .Values.configRepositoryId }}"
   DEPLOY_KEY: "{{ .Values.deployKey }}"
   GITLAB_API_URL: "{{ .Values.gitLabApiUrl }}"

deployment/values-dev.yaml

@@ -13,7 +13,6 @@ git:
   uri: https://github.com/rht-labs/open-management-portal-git-api.git
   ref: master
 
-configFile: false
 configRepositoryId: false
 deployKey: false
 gitLabApiUrl: false
@@ -22,7 +21,7 @@ engagementsRepositoryId: false
 
 config:
   hookFile:
-    path: /schema
+    path: /runtime
     name: webhooks.yaml
   hooks:
     - name: hook1
@@ -31,7 +30,7 @@ config:
     - name: hook2
       baseUrl: http://localhost/hook2
       token: anunoby
-  configFile:
-    path: /schema
-    name: config.yml
+  runtimeConfigFile:
+    path: /runtime
+    name: lodestar-runtime-config.yaml
 

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

@@ -54,8 +54,9 @@ void onStart(@Observes StartupEvent event) {
         String content = readFile(configFile);
         if (null != content) {
             configuration = File.builder().filePath(configFile).content(content).build();
+            LOGGER.debug("Loaded Runtine Config from File, {}", configFile);
         }
-        LOGGER.debug("Config File {}", configuration);
+       
     }
 
     public File getConfigFile() {

src/main/resources/application.properties

@@ -26,8 +26,8 @@ gitlab.deploy.key=${DEPLOY_KEY:0}
 
 # config 
 config.repository.id=${CONFIG_REPOSITORY_ID:1}
-config.file=${CONFIG_FILE:/schema/config.yml}
-webhook.file=${WEBHOOK_FILE:/schema/webhooks.yaml}
+config.file=${CONFIG_FILE:/runtime/lodestar-runtime-config.yaml}
+webhook.file=${WEBHOOK_FILE:/runtime/webhooks.yaml}
 webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
 config.gitlab.ref=${CONFIG_GITLAB_REF:master}
 commit.page.size=100

src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java

@@ -157,7 +157,7 @@ public File getFile(String projectId, String filePath, String ref) {
 
         }
 
-        if ("schema/webhooks.yaml".equalsIgnoreCase(filePath)) {
+        if ("runtime/webhooks.yaml".equalsIgnoreCase(filePath)) {
             String content = ResourceLoader.load("webhooks.yaml");
             content = new String(EncodingUtils.base64Encode(content.getBytes()), StandardCharsets.UTF_8);
             return File.builder().filePath(filePath).content(content).build();
@@ -186,8 +186,8 @@ public File getFile(String projectId, String filePath, String ref) {
             throw new WebApplicationException(500);
         }
 
-        if("schema/config.yml".equals(filePath)) {
-            String content = ResourceLoader.load("config.yml");
+        if("runtime/lodestar-runtime-config.yaml".equals(filePath)) {
+            String content = ResourceLoader.load("lodestar-runtime-config.yaml");
             content = new String(EncodingUtils.base64Encode(content.getBytes()), StandardCharsets.UTF_8);
             return File.builder().filePath(filePath).content(content).build();
         }

src/test/java/com/redhat/labs/omp/resource/ConfigResourceTest.java

@@ -15,7 +15,7 @@ class ConfigResourceTest {
     void testGetConfigFileSuccess() {
 
         given().when().contentType(ContentType.JSON).get("/api/v1/config").then().statusCode(200).body(is(
-                "{\"content\":\"---\\nproviders:\\n- label: AWS\\n  value: ec2\\n  regions:\\n  - label: US East 1 (N. Virginia)\\n    value: us-east-1\\n  - label: US East 2 (Ohio)\\n    value: us-east-2\\nopenshift:\\n  versions:\\n  - label: v4.1\\n    value: 4.1.31\\n  - label: v4.2\\n    value: 4.2.16\\n  - label: v4.3\\n    value: 4.3.0\\n  persistent-storage:\\n  - label: None\\n    value: none\\n  - label: 50GB\\n    value: 50G\\n  - label: 100GB\\n    value: 100G\\n  - label: 250GB\\n    value: 250G\\n  - label: 500GB\\n    value: 500G\\n  cluster-size:\\n  - label: Small\\n    value: small\\nuser-management:\\n  rbac:\\n    roles:\\n    - label: Developer \\n      value: developer\\n    - label: Observer \\n      value: observer\\n    - label: Admin \\n      value: admin\\n\",\"encoding\":\"base64\",\"file_path\":\"schema/config.yml\"}"));
+                "{\"content\":\"---\\nproviders:\\n- label: AWS\\n  value: ec2\\n  regions:\\n  - label: US East 1 (N. Virginia)\\n    value: us-east-1\\n  - label: US East 2 (Ohio)\\n    value: us-east-2\\nopenshift:\\n  versions:\\n  - label: v4.1\\n    value: 4.1.31\\n  - label: v4.2\\n    value: 4.2.16\\n  - label: v4.3\\n    value: 4.3.0\\n  persistent-storage:\\n  - label: None\\n    value: none\\n  - label: 50GB\\n    value: 50G\\n  - label: 100GB\\n    value: 100G\\n  - label: 250GB\\n    value: 250G\\n  - label: 500GB\\n    value: 500G\\n  cluster-size:\\n  - label: Small\\n    value: small\\nuser-management:\\n  rbac:\\n    roles:\\n    - label: Developer \\n      value: developer\\n    - label: Observer \\n      value: observer\\n    - label: Admin \\n      value: admin\\n\",\"encoding\":\"base64\",\"file_path\":\"runtime/lodestar-runtime-config.yaml\"}"));
 
     }
 

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

@@ -21,22 +21,22 @@ class ConfigServiceTest {
 
     @Test void testGetConfigFilePreLoaded() {
         ConfigService service = new ConfigService();
-        service.configFile = "src/test/resources/config.yml";
+        service.configFile = "src/test/resources/lodestar-runtime-config.yaml";
         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());
+        assertEquals("src/test/resources/lodestar-runtime-config.yaml", config.getFilePath());
+        assertEquals(ResourceLoader.load("lodestar-runtime-config.yaml"), config.getContent());
 
     }
 
     @Test void testGetConfigFileFromGitLab() {
         ConfigService service = new ConfigService();
-        service.configFile = "schema/config.yml";
+        service.configFile = "runtime/lodestar-runtime-config.yaml";
         service.webHooksFile = "src/test/resources/webhooks.yaml";
         service.marshaller = new JsonMarshaller();
 
@@ -48,8 +48,8 @@ class ConfigServiceTest {
         File config = service.getConfigFile();
 
         assertNotNull(config);
-        assertEquals("schema/config.yml", config.getFilePath());
-        assertEquals(ResourceLoader.load("config.yml"), config.getContent());
+        assertEquals("runtime/lodestar-runtime-config.yaml", config.getFilePath());
+        assertEquals(ResourceLoader.load("lodestar-runtime-config.yaml"), config.getContent());
 
     }
 
@@ -86,7 +86,7 @@ class ConfigServiceTest {
     @Test void testGetHookConfigLabNotEmpty() {
         ConfigService service = new ConfigService();
         service.configFile = "src/test/resources/config.yml";
-        service.webHooksFile = "/schema/webhooks.yaml";
+        service.webHooksFile = "/runtime/webhooks.yaml";
         service.marshaller = new JsonMarshaller();
 
         FileService fileService = new FileService();