Skip to content

Commit b2317a2

Browse files
nhsdevwsnhsdevws
committed
Merge branch 'master' into VED-687-Search-API-no-return-for-RSV
# Conflicts: # .github/workflows/sonarcloud.yml
2 parents d67af40 + 81a774a commit b2317a2

33 files changed

+453
-319
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ updates:
6060
- "/redis_sync"
6161
- "/lambdas/id_sync"
6262
- "/lambdas/shared"
63+
- "/mns_subscription"
6364
schedule:
6465
interval: "daily"
6566
open-pull-requests-limit: 1

‎.github/workflows/sonarcloud.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
- uses: actions/setup-python@v5
6464
with:
6565
python-version: 3.11
66-
cache: 'poetry'
6766

6867
- name: Set up AWS credentials
6968
env:
@@ -73,6 +72,9 @@ jobs:
7372
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
7473
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
7574
75+
- name: Install poetry
76+
run: pip install poetry==2.1.2
77+
7678
- name: Run unittest with filenameprocessor-coverage
7779
working-directory: filenameprocessor
7880
id: filenameprocessor
@@ -106,6 +108,8 @@ jobs:
106108
- name: Run unittest with coverage-ack-lambda
107109
working-directory: ack_backend
108110
id: acklambda
111+
env:
112+
PYTHONPATH: ${{ github.workspace }}/ack_backend/src:${{ github.workspace }}/ack_backend/tests
109113
continue-on-error: true
110114
run: |
111115
poetry install
@@ -173,7 +177,6 @@ jobs:
173177
PYTHONPATH: ${{ env.SHARED_PATH }}/src
174178
continue-on-error: true
175179
run: |
176-
poetry env use 3.11
177180
poetry install
178181
poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover -s tests -p "test_*.py" -v || echo "shared tests failed" >> ../../failed_tests.txt
179182
poetry run coverage xml -o ../../shared-coverage.xml
@@ -185,7 +188,6 @@ jobs:
185188
PYTHONPATH: ${{ env.LAMBDA_PATH }}/id_sync/src:${{ env.SHARED_PATH }}/src
186189
continue-on-error: true
187190
run: |
188-
poetry env use 3.11
189191
poetry install
190192
poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover || echo "id_sync tests failed" >> ../../failed_tests.txt
191193
poetry run coverage xml -o ../../id_sync-coverage.xml

‎ack_backend/pyproject.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ version = "0.1.0"
44
description = ""
55
authors = ["Your Name <[email protected]>"]
66
readme = "README.md"
7+
packages = [
8+
{include = "src"}
9+
]
710

811
[tool.poetry.dependencies]
912
python = "~3.11"

‎ack_backend/tests/test_ack_processor.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
from boto3 import client as boto3_client
99
from moto import mock_s3, mock_firehose
1010

11-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
11+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13+
from tests.utils.utils_for_ack_backend_tests import (
1414
setup_existing_ack_file,
1515
validate_ack_file_content,
1616
)
17-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
17+
from tests.utils.values_for_ack_backend_tests import (
1818
DiagnosticsDictionaries,
1919
MOCK_MESSAGE_DETAILS,
2020
ValidValues,

‎ack_backend/tests/test_convert_message_to_ack_row.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from moto import mock_s3, mock_firehose
77

88

9-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
10-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
11-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
9+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, REGION_NAME
10+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
11+
from tests.utils.values_for_ack_backend_tests import (
1212
DefaultValues,
1313
ValidValues,
1414
DiagnosticsDictionaries,

‎ack_backend/tests/test_splunk_logging.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
from moto import mock_s3
99
from boto3 import client as boto3_client
1010

11-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import (
11+
from tests.utils.values_for_ack_backend_tests import (
1212
ValidValues,
1313
InvalidValues,
1414
DiagnosticsDictionaries,
1515
EXPECTED_ACK_LAMBDA_RESPONSE_FOR_SUCCESS,
1616
)
17-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
18-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
19-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import generate_event
17+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames
18+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
19+
from tests.utils.utils_for_ack_backend_tests import generate_event
2020

2121
with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
2222
from ack_processor import lambda_handler

‎ack_backend/tests/test_update_ack_file.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
from boto3 import client as boto3_client
88
from moto import mock_s3
99

10-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, DefaultValues
11-
from tests.utils_for_ack_backend_tests.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12-
from tests.utils_for_ack_backend_tests.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13-
from tests.utils_for_ack_backend_tests.utils_for_ack_backend_tests import (
10+
from tests.utils.values_for_ack_backend_tests import ValidValues, DefaultValues
11+
from tests.utils.mock_environment_variables import MOCK_ENVIRONMENT_DICT, BucketNames, REGION_NAME
12+
from tests.utils.generic_setup_and_teardown_for_ack_backend import GenericSetUp, GenericTearDown
13+
from tests.utils.utils_for_ack_backend_tests import (
1414
setup_existing_ack_file,
1515
obtain_current_ack_file_content,
1616
generate_expected_ack_file_row,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Generic setup and teardown for ACK backend tests"""
22

3-
from tests.utils_for_ack_backend_tests.mock_environment_variables import BucketNames, Firehose, REGION_NAME
3+
from tests.utils.mock_environment_variables import BucketNames, Firehose, REGION_NAME
44

55

66
class GenericSetUp:

ack_backend/tests/utils_for_ack_backend_tests/mock_environment_variables.py renamed to ack_backend/tests/utils/mock_environment_variables.py

File renamed without changes.

ack_backend/tests/utils_for_ack_backend_tests/utils_for_ack_backend_tests.py renamed to ack_backend/tests/utils/utils_for_ack_backend_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import json
44
from boto3 import client as boto3_client
5-
from tests.utils_for_ack_backend_tests.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
6-
from tests.utils_for_ack_backend_tests.mock_environment_variables import REGION_NAME, BucketNames
5+
from tests.utils.values_for_ack_backend_tests import ValidValues, MOCK_MESSAGE_DETAILS
6+
from tests.utils.mock_environment_variables import REGION_NAME, BucketNames
77

88
s3_client = boto3_client("s3", region_name=REGION_NAME)
99
firehose_client = boto3_client("firehose", region_name=REGION_NAME)

0 commit comments

Comments
 (0)