TT-630 Environment Variables (#870)

* fix: TT-630 Remove keys.ts to store nev variables

* update: dockerfiles

Author: nicolsss

.github/workflows/CD-time-tracker-ui.yml

@@ -35,11 +35,14 @@ jobs:
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
       run: |
-        chmod +x ./scripts/populate-var-file.sh
-        sh ./scripts/populate-var-file.sh
+        chmod +x ./scripts/populate-keys.sh
+        sh ./scripts/populate-keys.sh
 
     - name: 'run: npm install and build'
       run: |
+        set -a
+        source .env
+        set +a
         npm install
         npm run build --prod --if-present
         cp scripts/default-static-site.js ${BUILD_PATH}

.github/workflows/CI-time-tracker-ui.yml

@@ -48,11 +48,16 @@ jobs:
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}
       run: |
-        chmod +x ./scripts/populate-var-file.sh
-        sh ./scripts/populate-var-file.sh
+        chmod +x ./scripts/populate-keys.sh
+        sh ./scripts/populate-keys.sh
 
     - name: Running tests
-      run: npm run ci-test --if-present
+      run: |
+        set -a
+        source .env
+        set +a
+        npm run ci-test --if-present
+        rm .env
 
     - name: Generate coverage report
       env:

Docker/Dockerfile.dev

@@ -12,4 +12,4 @@ RUN chown ${USERNAME}:${USERNAME} -R ${HOME}/time-tracker-ui \
 USER ${USERNAME}
 RUN npm cache clean --force && npm install
 EXPOSE 4200
-CMD npm run config && ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck
+CMD ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck

Docker/Dockerfile.test

@@ -44,4 +44,4 @@ COPY .env .
 EXPOSE 4200
 EXPOSE 9876
 RUN npm cache clean --force && npm install
-CMD npm run config && npm run ci-test
+CMD npm run ci-test

Dockerfile

@@ -10,10 +10,15 @@ RUN chmod -R 777 ${HOME}/time-tracker-ui
 
 USER ${USERNAME}
 RUN npm cache clean --force && npm install
+EXPOSE 4200
+EXPOSE 9876
+CMD ${HOME}/time-tracker-ui/node_modules/.bin/ng serve --host 0.0.0.0 --disableHostCheck
+
+
 
 FROM development as build
 COPY .env .
-RUN npm run config && npm run build
+RUN npm run build
 
 FROM nginx:1.21 AS production
 

package.json

@@ -2,7 +2,6 @@
   "name": "time-tracker",
   "version": "1.72.9",
   "scripts": {
-    "config": "ts-node ./scripts/setenv.ts",
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",
     "start": "ng serve",

scripts/populate-keys.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 > .env
-echo 'AUTHORITY = '$AUTHORITY'' >> .env
-echo 'CLIENT_ID = '$CLIENT_ID'' >> .env
-echo 'SCOPES = '$SCOPES'' >> .env
-echo 'STACK_EXCHANGE_ID = '$STACK_EXCHANGE_ID'' >> .env
-echo 'STACK_EXCHANGE_ACCESS_TOKEN = '$STACK_EXCHANGE_ACCESS_TOKEN'' >> .env
-echo 'AZURE_APP_CONFIGURATION_CONNECTION_STRING = '$AZURE_APP_CONFIGURATION_CONNECTION_STRING'' >> .env
+echo "AUTHORITY='$AUTHORITY'" >> .env
+echo "CLIENT_ID='$CLIENT_ID'" >> .env
+echo "SCOPES='$SCOPES'" >> .env
+echo "STACK_EXCHANGE_ID='$STACK_EXCHANGE_ID'" >> .env
+echo "STACK_EXCHANGE_ACCESS_TOKEN='$STACK_EXCHANGE_ACCESS_TOKEN'" >> .env
+echo "AZURE_APP_CONFIGURATION_CONNECTION_STRING='$AZURE_APP_CONFIGURATION_CONNECTION_STRING'" >> .env
 cat .env

scripts/populate-var-file.sh

@@ -1,18 +1,17 @@
-import * as keys from './keys';
 
 export const environment = {
   production: true,
   timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
   stackexchangeApiUrl: 'https://api.stackexchange.com',
 };
 
-export const AUTHORITY = keys.AUTHORITY;
-export const CLIENT_ID = keys.CLIENT_ID;
-export const SCOPES = keys.SCOPES;
+export const AUTHORITY = process.env["AUTHORITY"];
+export const CLIENT_ID = process.env["CLIENT_ID"];
+export const SCOPES = process.env["SCOPES"].split(",");
 export const ITEMS_PER_PAGE = 5;
-export const STACK_EXCHANGE_ID = keys.STACK_EXCHANGE_ID;
-export const STACK_EXCHANGE_ACCESS_TOKEN = keys.STACK_EXCHANGE_ACCESS_TOKEN;
-export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = keys.AZURE_APP_CONFIGURATION_CONNECTION_STRING;
+export const STACK_EXCHANGE_ID = process.env["STACK_EXCHANGE_ID"];
+export const STACK_EXCHANGE_ACCESS_TOKEN = process.env["STACK_EXCHANGE_ACCESS_TOKEN"];
+export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = process.env["AZURE_APP_CONFIGURATION_CONNECTION_STRING"];
 export const DATE_FORMAT = 'yyyy-MM-dd';
 export const DATE_FORMAT_YEAR = 'YYYY-MM-DD';
 export const GROUPS = {