VED-699 Sonar Coverage (#720)

* init: move 'install poetry'

* move 'install poetry' II

* Set strict versions to 3.11

* fixed Poetry files

* removed unused aws credentials

* MNS poetry lock

* Poetry lock for id_sync

* Poetry lock for shared

* restored aws test credentials

* path for ack_backend

* Standardised ack_lambda

---------

Co-authored-by: robertnovac1 <[email protected]>

Author: JamesW1-NHS

.github/workflows/sonarcloud.yml

@@ -21,13 +21,9 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install poetry
-        run: pip install poetry==2.1.2
-
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11
-          cache: 'poetry'
 
       - name: Set up AWS credentials
         env:
@@ -37,6 +33,9 @@ jobs:
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
 
+      - name: Install poetry
+        run: pip install poetry==2.1.2
+
       - name: Run unittest with filenameprocessor-coverage
         working-directory: filenameprocessor
         id: filenameprocessor
@@ -70,6 +69,8 @@ jobs:
       - name: Run unittest with coverage-ack-lambda
         working-directory: ack_backend
         id: acklambda
+        env:
+          PYTHONPATH: ${{ github.workspace }}/ack_backend/src:${{ github.workspace }}/ack_backend/tests
         continue-on-error: true
         run: |
           poetry install
@@ -137,7 +138,6 @@ jobs:
           PYTHONPATH: ${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
-            poetry env use 3.11
             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
@@ -149,7 +149,6 @@ jobs:
           PYTHONPATH: ${{ env.LAMBDA_PATH }}/id_sync/src:${{ env.SHARED_PATH }}/src
         continue-on-error: true
         run: |
-            poetry env use 3.11
             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

ack_backend/pyproject.toml

@@ -4,6 +4,9 @@ version = "0.1.0"
 description = ""
 authors = ["Your Name <[email protected]>"]
 readme = "README.md"
+packages = [
+    {include = "src"}
+]
 
 [tool.poetry.dependencies]
 python = "~3.11"

ack_backend/tests/test_ack_processor.py

@@ -8,13 +8,13 @@
 from boto3 import client as boto3_client
 from moto import mock_s3, mock_firehose
 
-from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
-from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
-from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
+from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
+from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
+from tests.utils.utils_for_ack_backend_tests import (
     setup_existing_ack_file,
     validate_ack_file_content,
 )
-from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
+from tests.utils.values_for_ack_backend_tests import (
     DiagnosticsDictionaries,
     MOCK_MESSAGE_DETAILS,
     ValidValues,

ack_backend/tests/test_convert_message_to_ack_row.py

@@ -6,9 +6,9 @@
 from moto import mock_s3, mock_firehose
 
 
-from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
-from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
-from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
+from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
+from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
+from tests.utils.values_for_ack_backend_tests import (
     DefaultValues,
     ValidValues,
     DiagnosticsDictionaries,

ack_backend/tests/test_splunk_logging.py

@@ -8,15 +8,15 @@
 from moto import mock_s3
 from boto3 import client as boto3_client
 
-from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
+from tests.utils.values_for_ack_backend_tests import (
     ValidValues,
     InvalidValues,
     DiagnosticsDictionaries,
     EXPECTED_ACK_LAMBDA_RESPONSE_FOR_SUCCESS,
 )
-from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
-from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
-from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import generate_event
+from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
+from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
+from tests.utils.utils_for_ack_backend_tests import generate_event
 
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from ack_processor import lambda_handler

ack_backend/tests/test_update_ack_file.py

@@ -7,10 +7,10 @@
 from boto3 import client as boto3_client
 from moto import mock_s3
 
-from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, DefaultValues
-from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
-from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
-from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
+from tests.utils.values_for_ack_backend_tests import ValidValues, DefaultValues
+from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
+from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
+from tests.utils.utils_for_ack_backend_tests import (
     setup_existing_ack_file,
     obtain_current_ack_file_content,
     generate_expected_ack_file_row,

…ic_setup_and_teardown_for_ack_backend.py …ic_setup_and_teardown_for_ack_backend.pyack_backend/tests/utils_for_ack_backend_tests/generic_setup_and_teardown_for_ack_backend.py renamed to ack_backend/tests/utils/generic_setup_and_teardown_for_ack_backend.py ack_backend/tests/utils_for_ack_backend_tests/generic_setup_and_teardown_for_ack_backend.py renamed to ack_backend/tests/utils/generic_setup_and_teardown_for_ack_backend.py

@@ -1,6 +1,6 @@
 """Generic setup and teardown for ACK backend tests"""
 
-from tests.utils_for_ack_backend_tests.mock_environment_variables import BucketNames, Firehose, REGION_NAME
+from tests.utils.mock_environment_variables import BucketNames, Firehose, REGION_NAME
 
 
 class GenericSetUp:

…kend_tests/mock_environment_variables.py …ests/utils/mock_environment_variables.pyack_backend/tests/utils_for_ack_backend_tests/mock_environment_variables.py renamed to ack_backend/tests/utils/mock_environment_variables.py ack_backend/tests/utils_for_ack_backend_tests/mock_environment_variables.py renamed to ack_backend/tests/utils/mock_environment_variables.py

@@ -2,8 +2,8 @@
 
 import json
 from boto3 import client as boto3_client
-from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
-from tests.utils_for_ack_backend_tests.mock_environment_variables import REGION_NAME, BucketNames
+from tests.utils.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
+from tests.utils.mock_environment_variables import REGION_NAME, BucketNames
 
 s3_client = boto3_client("s3", region_name=REGION_NAME)
 firehose_client = boto3_client("firehose", region_name=REGION_NAME)