From 6de0063b7bedacd79d5bd7dac9ebfe06e15f5f6c Mon Sep 17 00:00:00 2001
From: Cristian Toaquiza <cristian.toaquiza@ioet.com>
Date: Tue, 23 Nov 2021 13:26:38 -0500
Subject: [PATCH 1/2] ci: [TT-412] adds ci workflow when push to master

---
 ...me-tracker-v1-on-pull-request-workflow.yml |  4 +-
 .../time-tracker-v1-on-push-workflow.yml      | 67 +++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/time-tracker-v1-on-push-workflow.yml

diff --git a/.github/workflows/time-tracker-v1-on-pull-request-workflow.yml b/.github/workflows/time-tracker-v1-on-pull-request-workflow.yml
index af4d872a..c35be604 100644
--- a/.github/workflows/time-tracker-v1-on-pull-request-workflow.yml
+++ b/.github/workflows/time-tracker-v1-on-pull-request-workflow.yml
@@ -1,11 +1,11 @@
-name: Time Tacker V1 CI
+name: Time Tacker V1 CI - ON PR
 
 on:
   pull_request:
     branches: [master]
 
 jobs:
-  time-tracker-ci:
+  time-tracker-ci-v1-on-pr:
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/.github/workflows/time-tracker-v1-on-push-workflow.yml b/.github/workflows/time-tracker-v1-on-push-workflow.yml
new file mode 100644
index 00000000..ed673b64
--- /dev/null
+++ b/.github/workflows/time-tracker-v1-on-push-workflow.yml
@@ -0,0 +1,67 @@
+name: Time Tacker V1 CI - ON PUSH
+
+on:
+  push:
+    # update to master
+    branches: [TT-412-onpush]
+
+jobs:
+  time-tracker-ci-v1-on-push:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.9]
+
+    steps:
+      - name: Checking out code from the repository
+        uses: actions/checkout@v2
+
+      - name: Setting up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements/time_tracker_api/dev.txt
+          pip install -r requirements/time_tracker_events/dev.txt
+
+      - name: Login to azure
+        uses: Azure/login@v1
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Get vault from azure
+        uses: Azure/get-keyvault-secrets@v1
+        with:
+          keyvault: "time-tracker-secrets"
+          secrets: "MS-CLIENT-ID, MS-AUTHORITY, MS-SCOPE, MS-SECRET, MS-ENDPOINT, USERID, AZURE-APP-CONFIGURATION-CONNECTION-STRING, DATABASE-ACCOUNT-URI, DATABASE-MASTER-KEY, DATABASE-NAME, AZURE-STORAGE-ACCOUNT-KEY"
+        id: timeTrackerAzureVault
+
+      - name: Run tests
+        env:
+          MS_AUTHORITY: ${{ steps.timeTrackerAzureVault.outputs.MS-AUTHORITY }}
+          MS_CLIENT_ID: ${{ steps.timeTrackerAzureVault.outputs.MS-CLIENT-ID }}
+          MS_SCOPE: ${{ steps.timeTrackerAzureVault.outputs.MS-SCOPE }}
+          MS_SECRET: ${{ steps.timeTrackerAzureVault.outputs.MS-SECRET }}
+          MS_ENDPOINT: ${{ steps.timeTrackerAzureVault.outputs.MS-ENDPOINT }}
+          USERID: ${{ steps.timeTrackerAzureVault.outputs.USERID }}
+          AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ steps.timeTrackerAzureVault.outputs.AZURE-APP-CONFIGURATION-CONNECTION-STRING }}
+          DATABASE_ACCOUNT_URI: ${{ steps.timeTrackerAzureVault.outputs.DATABASE-ACCOUNT-URI }}
+          DATABASE_MASTER_KEY: ${{ steps.timeTrackerAzureVault.outputs.DATABASE-MASTER-KEY }}
+          DATABASE_NAME: ${{ steps.timeTrackerAzureVault.outputs.DATABASE-NAME }}
+          AZURE_STORAGE_ACCOUNT_KEY: ${{ steps.timeTrackerAzureVault.outputs.AZURE-STORAGE-ACCOUNT-KEY }}
+        run: |
+          pytest tests
+
+      - name: Build and push image
+        uses: azure/docker-login@v1
+        with:
+          login-server: ${{ secrets.REGISTRY_LOGIN_SERVER }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+        run: |
+          docker build . -t ${{ secrets.REGISTRY_LOGIN_SERVER }}/timetrackerapi:${{ github.sha }}
+          docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/timetrackerapi:${{ github.sha }}

From 2356bd7829a53f07e2406b0e791c12da9fb129eb Mon Sep 17 00:00:00 2001
From: Cristian Toaquiza <cristian.toaquiza@ioet.com>
Date: Tue, 23 Nov 2021 13:26:38 -0500
Subject: [PATCH 2/2] ci: [TT-412] adds ci workflow when push to master

---
 .github/workflows/time-tracker-v1-on-push-workflow.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/time-tracker-v1-on-push-workflow.yml b/.github/workflows/time-tracker-v1-on-push-workflow.yml
index ed673b64..152998b4 100644
--- a/.github/workflows/time-tracker-v1-on-push-workflow.yml
+++ b/.github/workflows/time-tracker-v1-on-push-workflow.yml
@@ -2,8 +2,7 @@ name: Time Tacker V1 CI - ON PUSH
 
 on:
   push:
-    # update to master
-    branches: [TT-412-onpush]
+    branches: [master]
 
 jobs:
   time-tracker-ci-v1-on-push:
@@ -56,12 +55,13 @@ jobs:
         run: |
           pytest tests
 
-      - name: Build and push image
+      - name: Login to docker registry
         uses: azure/docker-login@v1
         with:
           login-server: ${{ secrets.REGISTRY_LOGIN_SERVER }}
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Build and push image
         run: |
           docker build . -t ${{ secrets.REGISTRY_LOGIN_SERVER }}/timetrackerapi:${{ github.sha }}
           docker push ${{ secrets.REGISTRY_LOGIN_SERVER }}/timetrackerapi:${{ github.sha }}