cleanup

Author: JamesW1-NHS

.github/dependabot.yml

@@ -49,7 +49,6 @@ updates:
   - package-ecosystem: "pip"
     directories:
       - "/"
-      - "/lambdas/ack_backend"
       - "/backend"
       - "/batch_processor_filter"
       - "/delta_backend"
@@ -58,6 +57,7 @@ updates:
       - "/filenameprocessor"
       - "/mesh_processor"
       - "/recordprocessor"
+      - "/lambdas/ack_backend"
       - "/lambdas/redis_sync"
       - "/lambdas/id_sync"
       - "/lambdas/mns_subscription"

.github/workflows/sonarcloud.yml

@@ -80,17 +80,6 @@ jobs:
           poetry run coverage run -m unittest discover -p "*batch*.py" || echo "recordforwarder tests failed" >> ../failed_tests.txt
           poetry run coverage xml -o ../recordforwarder-coverage.xml
 
-      - name: Run unittest with coverage-ack-lambda
-        working-directory: lambdas/ack_backend
-        id: acklambda
-        env:
-          PYTHONPATH: ${{ env.LAMBDA_PATH }}/ack_backend/src:${{ github.workspace }}/ack_backend/tests
-        continue-on-error: true
-        run: |
-            poetry install
-            poetry run coverage run -m unittest discover || echo "ack-lambda tests failed" >> ../../failed_tests.txt
-            poetry run coverage xml -o ../../ack-lambda-coverage.xml
-
       - name: Run unittest with coverage-delta
         working-directory: delta_backend
         id: delta
@@ -122,6 +111,17 @@ jobs:
           poetry run coverage run -m unittest discover || echo "mesh_processor tests failed" >> ../failed_tests.txt
           poetry run coverage xml -o ../mesh_processor-coverage.xml
 
+      - name: Run unittest with coverage-ack-lambda
+        working-directory: lambdas/ack_backend
+        id: acklambda
+        env:
+          PYTHONPATH: ${{ env.LAMBDA_PATH }}/ack_backend/src:${{ github.workspace }}/ack_backend/tests
+        continue-on-error: true
+        run: |
+            poetry install
+            poetry run coverage run -m unittest discover || echo "ack-lambda tests failed" >> ../../failed_tests.txt
+            poetry run coverage xml -o ../../ack-lambda-coverage.xml
+
       - name: Run unittest with coverage-mns-subscription
         working-directory: lambdas/mns_subscription
         id: mns_subscription

immunisation-fhir-api.code-workspace

@@ -12,9 +12,6 @@
 		{
 			"path": "recordprocessor"
 		},
-		{
-			"path": "lambdas/ack_backend"
-		},
 		{
 			"path": "delta_backend"
 		},
@@ -27,6 +24,9 @@
 		{
 			"path": "e2e_batch"
 		},
+		{
+			"path": "lambdas/ack_backend"
+		},
         {
             "path": "lambdas/redis_sync"
         },

lambdas/.coveragerc

@@ -6,6 +6,3 @@ omit =
     id_sync/tests/*
     id_sync/tests/*/*
     id_sync/tests/*/*/*
-    ack_backend/tests/*
-    ack_backend/tests/*/*
-    ack_backend/tests/*/*/*

terraform/shared.tf

@@ -1,8 +1,8 @@
-# Define locals for shared lambdas
-locals {
-  shared_dir        = abspath("${path.root}/../shared")
-
-  shared_files      = fileset(local.shared_dir, "**")
-
-  shared_dir_sha    = sha1(join("", [for f in local.shared_files : filesha1("${local.shared_dir}/${f}")]))
-}
+# Define locals for shared lambdas
+locals {
+  shared_dir        = abspath("${path.root}/../shared")
+
+  shared_files      = fileset(local.shared_dir, "**")
+
+  shared_dir_sha    = sha1(join("", [for f in local.shared_files : filesha1("${local.shared_dir}/${f}")]))
+}