VED-779 Refactor MNS (#836)

* parked

* rm zone

* rm old dir

* post-deploy

* shared

* test: revert post-deploy

* makefile

* sonarcloud

* errors.py

* lint

* errors II

* errors III

* imports

* corrections

* common/redis_client

* remove duplication

* exception v internal server error

* removed secret logging

* indentation

* PDS/MNS secret TODO

* PDS/MNS secret TODO II

* revert PDS/MNS secret: comment only

Author: JamesW1-NHS

.github/dependabot.yml

@@ -60,8 +60,8 @@ updates:
       - "/recordprocessor"
       - "/lambdas/redis_sync"
       - "/lambdas/id_sync"
+      - "/lambdas/mns_subscription"
       - "/lambdas/shared"
-      - "/mns_subscription"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 1

.github/workflows/sonarcloud.yml

@@ -123,16 +123,16 @@ jobs:
           poetry run coverage xml -o ../mesh_processor-coverage.xml
 
       - name: Run unittest with coverage-mns-subscription
-        working-directory: mns_subscription
-        env:
-          PYTHONPATH: ${{ github.workspace }}/mns_subscription/src:${{ github.workspace }}/mns_subscription/tests
+        working-directory: lambdas/mns_subscription
         id: mns_subscription
+        env:
+          PYTHONPATH: ${{ env.LAMBDA_PATH }}/mns_subscription/src:${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
           poetry install
-          poetry run coverage run -m unittest discover || echo "mns_subscription tests failed" >> ../failed_tests.txt
+          poetry run coverage run -m unittest discover || echo "mns_subscription tests failed" >> ../../failed_tests.txt
           poetry run coverage report -m
-          poetry run coverage xml -o ../mns_subscription-coverage.xml
+          poetry run coverage xml -o ../../mns_subscription-coverage.xml
 
       - name: Run unittest with redis_sync
         working-directory: lambdas/redis_sync
@@ -141,9 +141,9 @@ jobs:
           PYTHONPATH: ${{ env.LAMBDA_PATH }}/redis_sync/src:${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
-            poetry install
-            poetry run coverage run --source=src -m unittest discover || echo "redis_sync tests failed" >> ../../failed_tests.txt
-            poetry run coverage xml -o ../../redis_sync-coverage.xml
+          poetry install
+          poetry run coverage run --source=src -m unittest discover || echo "redis_sync tests failed" >> ../../failed_tests.txt
+          poetry run coverage xml -o ../../redis_sync-coverage.xml
 
       - name: Run unittest with shared
         working-directory: lambdas/shared
@@ -152,9 +152,9 @@ jobs:
           PYTHONPATH: ${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
-            poetry install
-            poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover -s tests -p "test_*.py" -v || echo "shared tests failed" >> ../../failed_tests.txt
-            poetry run coverage xml -o ../../shared-coverage.xml
+          poetry install
+          poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover -s tests -p "test_*.py" -v || echo "shared tests failed" >> ../../failed_tests.txt
+          poetry run coverage xml -o ../../shared-coverage.xml
 
       - name: Run unittest with id_sync
         working-directory: lambdas/id_sync
@@ -163,9 +163,9 @@ jobs:
           PYTHONPATH: ${{ env.LAMBDA_PATH }}/id_sync/src:${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
-            poetry install
-            poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover || echo "id_sync tests failed" >> ../../failed_tests.txt
-            poetry run coverage xml -o ../../id_sync-coverage.xml
+          poetry install
+          poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover || echo "id_sync tests failed" >> ../../failed_tests.txt
+          poetry run coverage xml -o ../../id_sync-coverage.xml
 
       - name: Run Test Failure Summary
         id: check_failure

Makefile

@@ -1,6 +1,6 @@
 SHELL=/usr/bin/env bash -euo pipefail
 
-PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend batch_processor_filter delta_backend filenameprocessor mesh_processor recordprocessor lambdas/redis_sync lambdas/id_sync lambdas/shared mns_subscription
+PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = ack_backend backend batch_processor_filter delta_backend filenameprocessor mesh_processor recordprocessor lambdas/redis_sync lambdas/id_sync lambdas/mns_subscription lambdas/shared
 PYTHON_PROJECT_DIRS = e2e e2e_batch $(PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS)
 
 #Installs dependencies using poetry.

immunisation-fhir-api.code-workspace

@@ -31,10 +31,10 @@
             "path": "lambdas/redis_sync"
         },
 		{
-            "path": "mns_subscription"
+			"path": "lambdas/id_sync"
         },
 		{
-			"path": "lambdas/id_sync"
+            "path": "lambdas/mns_subscription"
 		},
 		{
 			"path": "lambdas/shared"

lambdas/mns_subscription/.vscode/settings.json.default

@@ -0,0 +1,27 @@
+{
+    "python.analysis.extraPaths": [
+        "./src"
+    ],
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./",
+        "-p",
+        "test_*.py"
+    ],
+    "python.testing.pytestEnabled": false,
+    "python.testing.unittestEnabled": true,
+    "pylint.args": [
+        "--init-hook",
+        "import sys; sys.path.append('./src')"
+    ],
+    "[makefile]": {
+        "editor.insertSpaces": false,
+        "editor.detectIndentation": false
+    },
+    "files.trimTrailingWhitespace": true,
+    "[python]": {
+        "files.trimTrailingWhitespace": true
+    },
+    "files.insertFinalNewline": true
+}

lambdas/mns_subscription/Makefile

@@ -0,0 +1,23 @@
+RUN_ENV := @PYTHONPATH=src:../shared/src
+
+subscribe:
+	$(RUN_ENV) poetry run python src/subscribe_mns.py
+
+unsubscribe:
+	$(RUN_ENV) poetry run python src/unsubscribe_mns.py
+
+TEST_ENV := @PYTHONPATH=src:tests:../shared/src
+
+test:
+	$(TEST_ENV) python -m unittest
+
+coverage-run:
+	$(TEST_ENV) coverage run -m unittest discover
+
+coverage-report:
+	$(TEST_ENV) coverage report -m 
+
+coverage-html:
+	$(TEST_ENV) coverage html
+
+.PHONY: build package test