fix: TT-610 Fix pipeline (#849)

Co-authored-by: Erick Almeida <[email protected]>

Author: sbateca

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

@@ -35,8 +35,8 @@ 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-keys.sh
-        sh ./scripts/populate-keys.sh
+        chmod +x ./scripts/populate-var-file.sh
+        sh ./scripts/populate-var-file.sh
 
     - name: 'run: npm install and build'
       run: |

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

@@ -48,8 +48,8 @@ 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-keys.sh
-        sh ./scripts/populate-keys.sh
+        chmod +x ./scripts/populate-var-file.sh
+        sh ./scripts/populate-var-file.sh
 
     - name: Running tests
       run: npm run ci-test --if-present

Makefile

@@ -19,7 +19,7 @@ cleanup: ## Delete image timetracker_ui
 
 .PHONY: run
 run: ## Execute timetracker_ui docker containe.
-	docker-compose --env-file ./.env up -d
+	docker-compose up -d
 
 .PHONY: logs
 logs: ## Show logs of timetracker_ui.
@@ -40,12 +40,12 @@ remove: ## Delete container timetracker_ui.
 
 .PHONY: test
 test: ## Run all tests on docker container timetracker_ui at the CLI.
-	docker-compose -f docker-compose.yml --env-file ./.env up -d
+	docker-compose -f docker-compose.yml up -d
 	docker exec timetracker_ui bash -c "npm run ci-test"
 
 .PHONY: testdev
 testdev: ## Run all tests on docker container timetracker_ui at the Dev
-	docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file ./.env up -d
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
 	docker exec timetracker_ui bash -c "npm run ci-test"
 
 .PHONY: publish

scripts/populate-var-file.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+> src/environments/keys.ts
+echo 'export const AUTHORITY = "'$AUTHORITY'";' >> src/environments/keys.ts
+echo 'export const CLIENT_ID = "'$CLIENT_ID'";' >> src/environments/keys.ts
+echo 'export const SCOPES = ["'$SCOPES'"];' >> src/environments/keys.ts
+echo 'export const STACK_EXCHANGE_ID = "'$STACK_EXCHANGE_ID'";' >> src/environments/keys.ts
+echo 'export const STACK_EXCHANGE_ACCESS_TOKEN = "'$STACK_EXCHANGE_ACCESS_TOKEN'";' >> src/environments/keys.ts
+echo 'export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = "'$AZURE_APP_CONFIGURATION_CONNECTION_STRING'";' >> src/environments/keys.ts
+cat src/environments/keys.ts

scripts/setenv.ts

@@ -1,14 +1,13 @@
 const { writeFile } = require('fs');
-require('dotenv').config();
 
 const pathJs = `./src/environments/keys.ts`
-const contentKeys = 
-`export const AUTHORITY = '${process.env.AUTHORITY}';
-export const CLIENT_ID = '${process.env.CLIENT_ID}';
-export const SCOPES = ['${process.env.SCOPES}'];
-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}';
+const contentKeys =
+`export const AUTHORITY = '${process.env["AUTHORITY"]}';
+export const CLIENT_ID = '${process.env["CLIENT_ID"]}';
+export const SCOPES = ['${process.env["SCOPES"]}'];
+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"]}';
 `;
 
 writeFile(pathJs, contentKeys, function (err) {
@@ -19,7 +18,7 @@ writeFile(pathJs, contentKeys, function (err) {
 });
 
 const pathJson = `./src/environments/.keys.json`
-const contentKeysJson = 
+const contentKeysJson =
 `{
     "authority": "${process.env.AUTHORITY_JSON}",
     "client_id": "${process.env.CLIENT_ID_JSON}",