Merge pull request #15 from TaskarCenterAtUW/dev

upgrade osw-validation to 2.0

Author: susrisha

.github/workflows/dev_workflow.yaml

@@ -6,6 +6,9 @@ on:
     types:
       - closed
   workflow_dispatch:
+permissions:
+    id-token: write
+    contents: read
 
 jobs:
   Build:
@@ -29,9 +32,12 @@ jobs:
       name: Development
     runs-on: ubuntu-latest
     steps:
+    - name: Login to Azure
+      uses: azure/login@v2.0.0
+      with:
+        creds: ${{secrets.TDEI_CORE_AZURE_CREDS}}
     - name: Deploy to Dev
       uses: azure/webapps-deploy@v2
       with:
         app-name: ${{ secrets.AZURE_WEBAPP_NAME }}
-        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
         images: ${{ secrets.REGISTRY_DOMAIN }}/${{ secrets.REGISTRY_REPO }}:${{ github.sha }}

.github/workflows/stage_workflow.yaml

@@ -6,6 +6,9 @@ on:
     types:
       - closed
   workflow_dispatch:
+permissions:
+    id-token: write
+    contents: read
 
 jobs:
   Build:
@@ -29,9 +32,12 @@ jobs:
       name: Stage
     runs-on: ubuntu-latest
     steps:
+    - name: Login to Azure
+      uses: azure/login@v2.0.0
+      with:
+        creds: ${{secrets.TDEI_CORE_AZURE_CREDS}}
     - name: Deploy to Stage
       uses: azure/webapps-deploy@v2
       with:
         app-name: ${{ secrets.AZURE_WEBAPP_NAME }}
-        publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
         images: ${{ secrets.REGISTRY_DOMAIN }}/${{ secrets.REGISTRY_REPO }}:${{ github.sha }}.

README.md

@@ -116,7 +116,7 @@ Make sure you have set up the project properly before running the tests, see abo
    1. `python test_report.py`
    2. Above command will run all test cases and generate the html report, in `reports` folder at the root level.
 3. To run the coverage
-   1. `coverage run --source=src -m unittest discover -s tests/unit_tests`
+   1. `python -m coverage run --source=src -m unittest discover -s tests/unit_tests`
    2. Above command will run all the unit test cases.
    3. To generate the coverage report in console
       1. `coverage report`

requirements.txt

@@ -7,4 +7,4 @@ uvicorn==0.20.0
 coverage==7.2.7
 html_testRunner==1.2.1
 httpx==0.24.1
-python-osw-validation==0.0.5
+python-osw-validation==0.2.1

src/osw_validator.py

@@ -9,6 +9,7 @@
 from .validation import Validation
 from .models.queue_message_content import Upload, ValidationResult
 from .config import Settings
+import threading
 
 logging.basicConfig()
 logger = logging.getLogger('OSW_VALIDATOR')
@@ -40,7 +41,9 @@ def process(message) -> None:
             if message is not None:
                 queue_message = QueueMessage.to_dict(message)
                 upload_message = Upload.data_from(queue_message)
-                self.validate(upload_message)
+                process_thread = threading.Thread(target=self.validate, args=[upload_message])
+                process_thread.start()
+                # self.validate(upload_message)
 
         self.listening_topic.subscribe(subscription=self.subscription_name, callback=process)
 

test_report.py

@@ -3,7 +3,7 @@
 
 # Define your test cases
 from tests.unit_tests.test_queue_message_content import TestUpload, TestUploadData, TestToJson, TestValidationResult
-from tests.unit_tests.test_validation import TestSuccessValidation, TestFailureValidation
+from tests.unit_tests.test_validation import TestOtherValidation, TestValidation
 from tests.unit_tests.test_osw_validator import TestOSWValidator
 from tests.unit_tests.test_main import TestApp
 
@@ -15,8 +15,8 @@
     test_suite.addTest(unittest.makeSuite(TestUploadData))
     test_suite.addTest(unittest.makeSuite(TestToJson))
     test_suite.addTest(unittest.makeSuite(TestValidationResult))
-    test_suite.addTest(unittest.makeSuite(TestSuccessValidation))
-    test_suite.addTest(unittest.makeSuite(TestFailureValidation))
+    test_suite.addTest(unittest.makeSuite(TestOtherValidation))
+    test_suite.addTest(unittest.makeSuite(TestValidation))
     test_suite.addTest(unittest.makeSuite(TestOSWValidator))
     test_suite.addTest(unittest.makeSuite(TestApp))