Move env variabled to yaml

README.md

@@ -120,11 +120,11 @@ This will create an EFS (Elastic File System) and mount it on `/var/lib/jenkins`
 #### Add environment variables
 Users can add global level environment variables using configuration as code as follows:
 
-Update the `envVarsFilePath` property in `ciSettings` to the file path containing all environment variables in the form of key:value pair. See [CIStackProps](./lib/ci-stack.ts) for details.
+Update the `envVarsFilePath` property in `ciSettings` to the *yaml* file path containing all environment variables in the form of key:value pair. See [CIStackProps](./lib/ci-stack.ts) for details.
 
-Example: See [env.txt](./test/data/env.txt)
+Example: See [env.txt](./test/data/env.yaml)
 ```
-envVarsFilePath = 'test/data/env.txt'
+envVarsFilePath = 'test/data/env.yaml'
 ```
 
 #### Assume role

lib/compute/env-config.ts

@@ -1,4 +1,5 @@
 import { readFileSync } from 'fs';
+import { load } from 'js-yaml';
 
 /**
  * SPDX-License-Identifier: Apache-2.0
@@ -22,13 +23,9 @@ export class EnvConfig {
   public static addEnvConfigToJenkinsYaml(yamlObject: any, envVarsFilePath: string): any {
     const jenkinsYaml: any = yamlObject;
     const envArray: Env[] = [];
-    const envFile: string = readFileSync(envVarsFilePath, 'utf-8');
-    const c = envFile.split('\n');
-    c.forEach((item) => {
-      const e = item.split(/:(.*)/s).map((element) => element.trim());
-      envArray.push(new Env(e[0], e[1]));
-    });
+    const envFile: any = load(readFileSync(envVarsFilePath, 'utf-8'));
 
+    Object.keys(envFile).forEach((item) => envArray.push(new Env(item, envFile[item])));
     const newEnvVars: Env[] = envArray;
 
     const envConfig: { [x: string]: any; } = {

test/compute/env-config.test.ts

@@ -16,7 +16,7 @@ describe('Env Config', () => {
   const testYaml = 'test/data/test_env.yaml';
   const jenkinsYaml = load(readFileSync(JenkinsMainNode.BASE_JENKINS_YAML_PATH, 'utf-8'));
 
-  const envVarConfig = EnvConfig.addEnvConfigToJenkinsYaml(jenkinsYaml, 'test/data/env.txt');
+  const envVarConfig = EnvConfig.addEnvConfigToJenkinsYaml(jenkinsYaml, 'test/data/env.yaml');
   const newConfig = dump(envVarConfig);
   writeFileSync(testYaml, newConfig, 'utf-8');
 
@@ -27,11 +27,9 @@ describe('Env Config', () => {
       envVars: {
         env: [
           { key: 's3Bucket', value: 'artifactBucket' },
-          { key: 'account', value: '1234' },
-          { key: 'isStaging', value: 'true' },
+          { key: 'account', value: 1234 },
+          { key: 'isStaging', value: true },
           { key: 'url', value: 'https://url.com' },
-          { key: 'nospace', value: 'dummy' },
-          { key: 'multiplespace', value: 'spaces' },
         ],
       },
     };

test/data/env.yaml

@@ -0,0 +1,4 @@
+s3Bucket: artifactBucket
+account: 1234
+isStaging: true
+url: https://url.com

test/data/test_env.yaml

@@ -47,15 +47,11 @@ jenkins:
           - key: s3Bucket
             value: artifactBucket
           - key: account
-            value: '1234'
+            value: 1234
           - key: isStaging
-            value: 'true'
+            value: true
           - key: url
             value: https://url.com
-          - key: nospace
-            value: dummy
-          - key: multiplespace
-            value: spaces
 globalCredentialsConfiguration:
   configuration:
     providerFilter: none