From b515666cc0efad96aeb67038443edae1e6db0b3a Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 10:08:52 -0500 Subject: [PATCH 1/3] fix: TT-610 Fix pipeline --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f465cfed1..98d231b11 100644 --- a/Makefile +++ b/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 From 17c1a5335b688040cbe867449c25d4705bc58d61 Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 11:10:14 -0500 Subject: [PATCH 2/3] fix: TT-610 Fix pipeline - CI Time Tracker ui --- package.json | 2 +- scripts/setenv.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 396d1b3fe..733159dd0 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build": "ng build --prod", "test": "ng test --browsers ChromeHeadless", "test-headless": "ng test --browsers ChromeHeadless", - "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless", + "ci-test": "npm run config && ng test --no-watch --no-progress --browsers ChromeHeadless", "lint": "ng lint", "e2e": "ng e2e" }, diff --git a/scripts/setenv.ts b/scripts/setenv.ts index 0c07a1b30..9bc3b5069 100644 --- a/scripts/setenv.ts +++ b/scripts/setenv.ts @@ -2,7 +2,7 @@ const { writeFile } = require('fs'); require('dotenv').config(); const pathJs = `./src/environments/keys.ts` -const contentKeys = +const contentKeys = `export const AUTHORITY = '${process.env.AUTHORITY}'; export const CLIENT_ID = '${process.env.CLIENT_ID}'; export const SCOPES = ['${process.env.SCOPES}']; @@ -19,7 +19,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}", From a627255b3f8d97dac2ef767b5fe430a8390ba946 Mon Sep 17 00:00:00 2001 From: Erick Almeida Date: Thu, 14 Apr 2022 13:08:55 -0500 Subject: [PATCH 3/3] fix: TT-610 Fix pipeline - read from OS env variable in .ts --- .github/workflows/CI-time-tracker-ui.yml | 4 ++-- package.json | 2 +- scripts/populate-var-file.sh | 10 ++++++++++ scripts/setenv.ts | 13 ++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 scripts/populate-var-file.sh diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml index da410589a..f63625e00 100644 --- a/.github/workflows/CI-time-tracker-ui.yml +++ b/.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 diff --git a/package.json b/package.json index 733159dd0..396d1b3fe 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "build": "ng build --prod", "test": "ng test --browsers ChromeHeadless", "test-headless": "ng test --browsers ChromeHeadless", - "ci-test": "npm run config && ng test --no-watch --no-progress --browsers ChromeHeadless", + "ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless", "lint": "ng lint", "e2e": "ng e2e" }, diff --git a/scripts/populate-var-file.sh b/scripts/populate-var-file.sh new file mode 100644 index 000000000..f395689af --- /dev/null +++ b/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 diff --git a/scripts/setenv.ts b/scripts/setenv.ts index 9bc3b5069..659a587b2 100644 --- a/scripts/setenv.ts +++ b/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}'; +`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) {