fix: TT-418 serverless corrected and github files retored

Author: mandres2015

.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:
@@ -26,7 +26,6 @@ jobs:
           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:
@@ -54,7 +53,6 @@ jobs:
           AZURE_STORAGE_ACCOUNT_KEY: ${{ steps.timeTrackerAzureVault.outputs.AZURE-STORAGE-ACCOUNT-KEY }}
         run: |
           pytest tests
-
       - name: Test the build of the app
         run: |
-          docker build .
+          docker build .

.github/workflows/time-tracker-v1-on-push-workflow.yml

@@ -0,0 +1,65 @@
+name: Time Tacker V1 CI - ON PUSH
+
+on:
+  push:
+    branches: [master]
+
+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: 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 }}

V2/serverless.yml

@@ -2,8 +2,6 @@ service: azure-time-tracker
 
 frameworkVersion: "2"
 
-#region start Config
-
 provider:
   name: azure
   region: westus2
@@ -38,13 +36,11 @@ package:
     - "!.gitignore"
     - "!.git/**"
 
-#endregion end Config
-
 #region start Functions
 
 functions:
 
-#region start Activities
+#region Start Functions Activities
 
   get_activities:
     handler: time_tracker/activities/interface.get_activities
@@ -86,9 +82,9 @@ functions:
           route: activities/
           authLevel: anonymous
 
-#endregion end Activities
+#endregion End Functions Activities
 
-#region start Time-Entries
+#region Start Functions Time-Entries
 
   create_time_entry:
     handler: time_tracker/time_entries/interface.create_time_entry
@@ -130,9 +126,9 @@ functions:
           route: time-entries/{id}
           authLevel: anonymous   
 
-#endregion end Time-Entries
+#endregion End Functions Time-Entries
 
-#region start Customer
+#region Start Functions Customers
 
   create_customer:
     handler: time_tracker/customers/interface.create_customer
@@ -174,6 +170,50 @@ functions:
           route: customers/{id}
           authLevel: anonymous
 
-#endregion end Customer
+#endregion End Functions Customers
+
+#region Start Functions Projects
+
+  get_projects:
+    handler: time_tracker/projects/interface.get_projects
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - GET
+          route: projects/{id:?}
+          authLevel: anonymous
+
+  delete_project:
+    handler: time_tracker/projects/interface.delete_project
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - DELETE
+          route: projects/{id}
+          authLevel: anonymous
+
+  update_project:
+    handler: time_tracker/projects/interface.update_project
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - PUT   
+          route: projects/{id}
+          authLevel: anonymous    
+
+  create_project:
+    handler: time_tracker/projects/interface.create_project
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - POST
+          route: projects/
+          authLevel: anonymous
+
+#endregion End Functions Projects
 
-#endregion end Functions
+#endregion End Functions