Release 26.0 (#1031)

Tomdango · JackPlowman · mabe13 · web-flow · commit a34a326ab6f6 · 2024-09-24T13:55:00.000+01:00
# Release Branch Pull Request

## Description of Changes

This PR release DI version 26

Updates the project lambdas to Python 3.12

---------

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: Jack Plowman &lt;62281988+JackPlowman@users.noreply.github.com&gt;
Co-authored-by: Matthew Begley &lt;60427904+mabe13@users.noreply.github.com&gt;
Co-authored-by: Corbisc &lt;95412908+Corbisc@users.noreply.github.com&gt;
Co-authored-by: mabe13 &lt;matthewbegley@nhs.net&gt;
Co-authored-by: Michael Olaw &lt;michael.olaw1@nhs.net&gt;
Co-authored-by: Jack Plowman &lt;jack.plowman1@nhs.net&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
Co-authored-by: Vamsi Jonnagadda &lt;vamsijonnagadda@ICTs-MacBook-Pro.local&gt;
Co-authored-by: vkjonnagadda &lt;32249251+vkjonnagadda@users.noreply.github.com&gt;
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -38,7 +38,7 @@ jobs:
             -Dsonar.projectKey=uec-dos-int
             -Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
             -Dsonar.python.coverage.reportPaths=coverage.xml
-            -Dsonar.python.version=3.11
+            -Dsonar.python.version=3.12
             -Dsonar.exclusions=application/**/tests/**
 
   check-markdown-code-quality:
diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ The main components you will need for _basic_ development work, are your OS vers
 
 - A VPN Client (OpenVPN or Tunnelblick are 2 NHS Digital suggested options)
 - Git
-- Python (The project currently runs on 3.11)
+- Python (The project currently runs on 3.12)
 - AWS CLI
 - Docker
 
diff --git a/application/change_event_dlq_handler/requirements.txt b/application/change_event_dlq_handler/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
diff --git a/application/common/dos.py b/application/common/dos.py
@@ -27,7 +27,7 @@
 class DoSService:
     """Class to represent a DoS Service."""
 
-    id: int  # noqa: A003
+    id: int
     uid: int
     name: str
     odscode: str
@@ -251,10 +251,10 @@ def db_rows_to_spec_open_times(db_rows: Iterable[dict]) -> list[SpecifiedOpening
     """
     specified_opening_times = []
     date_sorted_rows = sorted(db_rows, key=lambda row: (row["date"], row["starttime"]))
-    for date, db_rows in groupby(date_sorted_rows, lambda row: row["date"]):
+    for date, rows in groupby(date_sorted_rows, lambda row: row["date"]):
         is_open = True
         open_periods = []
-        for row in list(db_rows):
+        for row in list(rows):
             if row["isclosed"] is True:
                 is_open = False
             else:
diff --git a/application/common/dos_location.py b/application/common/dos_location.py
@@ -6,7 +6,7 @@
 class DoSLocation:
     """A Class to represent a location in the UK store within the DoS Database locations table."""
 
-    id: int  # noqa: A003
+    id: int
     postcode: str
     easting: float
     northing: float
diff --git a/application/common/dynamodb.py b/application/common/dynamodb.py
@@ -49,7 +49,7 @@ def add_change_event_to_dynamodb(change_event: dict[str, Any], sequence_number:
         put_item = {k: serializer.serialize(v) for k, v in dynamo_record.items()}
         response = dynamodb.put_item(TableName=environ["CHANGE_EVENTS_TABLE_NAME"], Item=put_item)
         logger.info("Added record to dynamodb", response=response, item=put_item)
-    except Exception as err:  # noqa: BLE001
+    except Exception as err:
         msg = f"Unable to add change event (seq no: {sequence_number}) into dynamodb"
         raise DynamoDBError(msg) from err
     return record_id
diff --git a/application/common/tests/test_opening_times.py b/application/common/tests/test_opening_times.py
@@ -462,11 +462,11 @@ def test_specifiedopentime_export_service_history_format_open() -> None:
     # Act
     result = specified_opening_time.export_service_history_format()
     # Assert
-    assert [
+    assert result == [
         "2021-12-24-28800-43200",
         "2021-12-24-46800-63000",
         "2021-12-24-68400-84600",
-    ] == result
+    ]
 
 
 def test_specifiedopentime_export_service_history_format_closed() -> None:
@@ -475,7 +475,7 @@ def test_specifiedopentime_export_service_history_format_closed() -> None:
     # Act
     result = specified_opening_time.export_service_history_format()
     # Assert
-    assert ["2021-12-24-closed"] == result
+    assert result == ["2021-12-24-closed"]
 
 
 def test_specifiedopentime_export_dos_log_format_open() -> None:
@@ -488,7 +488,7 @@ def test_specifiedopentime_export_dos_log_format_open() -> None:
     # Act
     result = specified_opening_time.export_dos_log_format()
     # Assert
-    assert ["2021-12-24-09:00-11:00"] == result
+    assert result == ["2021-12-24-09:00-11:00"]
 
 
 def test_specifiedopentime_export_dos_log_format_closed() -> None:
@@ -497,7 +497,7 @@ def test_specifiedopentime_export_dos_log_format_closed() -> None:
     # Act
     result = specified_opening_time.export_dos_log_format()
     # Assert
-    assert ["2021-12-24-closed"] == result
+    assert result == ["2021-12-24-closed"]
 
 
 @pytest.mark.parametrize(
@@ -636,7 +636,7 @@ def test_stdopeningtimes_export_opening_times_for_day() -> None:
     # Act
     response = st1.export_opening_times_for_day("monday")
     # Assert
-    assert ["08:00-12:00", "13:00-18:00"] == response
+    assert response == ["08:00-12:00", "13:00-18:00"]
 
 
 def test_stdopeningtimes_export_opening_times_in_seconds_for_day() -> None:
@@ -649,7 +649,7 @@ def test_stdopeningtimes_export_opening_times_in_seconds_for_day() -> None:
     # Act
     response = st1.export_opening_times_in_seconds_for_day("monday")
     # Assert
-    assert ["32400-46800", "50400-68400"] == response
+    assert response == ["32400-46800", "50400-68400"]
 
 
 def test_standard_opening_times_export_test_format() -> None:
diff --git a/application/dos_db_handler/requirements.txt b/application/dos_db_handler/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
 psycopg[binary]
diff --git a/application/dos_db_update_dlq_handler/requirements.txt b/application/dos_db_update_dlq_handler/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
diff --git a/application/event_replay/requirements.txt b/application/event_replay/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
 simplejson
diff --git a/application/ingest_change_event/requirements.txt b/application/ingest_change_event/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer, validation] ~= 2.26.1
+aws-lambda-powertools[tracer, validation] ~= 2.43.0
diff --git a/application/quality_checker/requirements.txt b/application/quality_checker/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer, validation] ~= 2.26.1
+aws-lambda-powertools[tracer, validation] ~= 2.43.0
 psycopg[binary]
diff --git a/application/requirements-dev.txt b/application/requirements-dev.txt
@@ -15,6 +15,6 @@ pytest-rerunfailures
 pytest-sugar
 pytest-xdist
 requests
-ruff == 0.1.5
+ruff == 0.5.6
 testfixtures
 vulture
diff --git a/application/send_email/requirements.txt b/application/send_email/requirements.txt
@@ -1 +1 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
diff --git a/application/service_matcher/requirements.txt b/application/service_matcher/requirements.txt
@@ -1,3 +1,3 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
 psycopg[binary]
 pytz
diff --git a/application/service_sync/data_processing/tests/test_changes_to_dos.py b/application/service_sync/data_processing/tests/test_changes_to_dos.py
@@ -16,8 +16,8 @@ def test_changes_to_dos() -> None:
     assert dos_service == changes_to_dos.dos_service
     assert nhs_entity == changes_to_dos.nhs_entity
     assert service_histories == changes_to_dos.service_histories
-    assert {} == changes_to_dos.demographic_changes
-    assert {} == changes_to_dos.standard_opening_times_changes
+    assert changes_to_dos.demographic_changes == {}
+    assert changes_to_dos.standard_opening_times_changes == {}
     assert False is changes_to_dos.specified_opening_times_changes
     assert None is changes_to_dos.new_address
     assert None is changes_to_dos.new_postcode
diff --git a/application/service_sync/data_processing/tests/test_service_histories.py b/application/service_sync/data_processing/tests/test_service_histories.py
@@ -24,9 +24,9 @@ def test_service_histories(mock_time: MagicMock) -> None:
     # Act
     service_histories = ServiceHistories(service_id=SERVICE_ID)
     # Assert
-    assert "new_change" == service_histories.NEW_CHANGE_KEY
-    assert {} == service_histories.service_history
-    assert {} == service_histories.existing_service_history
+    assert service_histories.NEW_CHANGE_KEY == "new_change"
+    assert service_histories.service_history == {}
+    assert service_histories.existing_service_history == {}
     assert service_histories.service_id == SERVICE_ID
     assert time == service_histories.current_epoch_time
     mock_time.assert_called_once()
@@ -61,7 +61,7 @@ def test_service_histories_get_service_history_from_db_no_rows_returned() -> Non
     service_history.get_service_history_from_db(mock_connection)
     # Assert
     assert False is service_history.history_already_exists
-    assert {} == service_history.existing_service_history
+    assert service_history.existing_service_history == {}
     mock_connection.cursor.assert_called_once_with(row_factory=dict_row)
     mock_connection.cursor.return_value.execute.assert_called_once_with(
         query="Select history from servicehistories where serviceid = %(SERVICE_ID)s",
@@ -77,13 +77,13 @@ def test_service_histories_create_service_histories_entry_no_history_already_exi
     # Act
     service_history.create_service_histories_entry()
     # Assert
-    assert {
+    assert service_history.service_history == {
         service_history.NEW_CHANGE_KEY: {
             "new": {},
             "initiator": {"userid": "DOS_INTEGRATION", "timestamp": "TBD"},
             "approver": {"userid": "DOS_INTEGRATION", "timestamp": "TBD"},
         },
-    } == service_history.service_history
+    }
 
 
 def test_service_histories_add_change() -> None:
@@ -96,13 +96,13 @@ def test_service_histories_add_change() -> None:
     # Act
     service_history.add_change(change_key, mock_service_history_change)
     # Assert
-    assert {
+    assert service_history.service_history == {
         service_history.NEW_CHANGE_KEY: {
             "new": {change_key: change},
             "initiator": {"userid": "DOS_INTEGRATION", "timestamp": "TBD"},
             "approver": {"userid": "DOS_INTEGRATION", "timestamp": "TBD"},
         },
-    } == service_history.service_history
+    }
     mock_service_history_change.get_change.assert_called_once_with()
 
 
@@ -115,9 +115,9 @@ def test_service_histories_add_standard_opening_times_change(mock_service_histor
     current_opening_times.export_opening_times_in_seconds_for_day.return_value = current_opening_times_in_seconds = [
         "456-789",
     ]
-    current_opening_times.export_opening_times_for_day.return_value = (
-        current_opening_times_for_day
-    ) = "current_opening_times_for_day"
+    current_opening_times.export_opening_times_for_day.return_value = current_opening_times_for_day = (
+        "current_opening_times_for_day"
+    )
     new_opening_times = MagicMock()
     new_opening_times.export_opening_times_in_seconds_for_day.return_value = new_opening_times_in_seconds = ["123-456"]
     weekday = "Monday"
@@ -146,16 +146,16 @@ def test_service_histories_add_standard_opening_times_change(mock_service_histor
 
 @patch(f"{FILE_PATH}.ServiceHistoriesChange")
 def test_service_histories_add_standard_opening_times_change_no_change(
-    mock_service_histories_change: MagicMock
+    mock_service_histories_change: MagicMock,
 ) -> None:
     # Arrange
     service_history = ServiceHistories(service_id=SERVICE_ID)
     service_history.add_change = mock_add_change = MagicMock()
     current_opening_times = MagicMock()
     current_opening_times.export_opening_times_in_seconds_for_day.return_value = []
-    current_opening_times.export_opening_times_for_day.return_value = (
-        current_opening_times_for_day
-    ) = "current_opening_times_for_day"
+    current_opening_times.export_opening_times_for_day.return_value = current_opening_times_for_day = (
+        "current_opening_times_for_day"
+    )
     new_opening_times = MagicMock()
     new_opening_times.export_opening_times_in_seconds_for_day.return_value = []
     weekday = "Monday"
@@ -354,11 +354,11 @@ def test_service_histories_get_formatted_specified_opening_times() -> None:
         opening_times=specified_opening_times,
     )
     # Assert
-    assert [
+    assert formatted_specified_opening_times == [
         "2022-12-26-3600-7200",
         "2022-12-26-10800-18000",
         "2022-12-26-28800-43200",
-    ] == formatted_specified_opening_times
+    ]
 
 
 @patch(f"{FILE_PATH}.datetime")
diff --git a/application/service_sync/data_processing/tests/test_service_histories_change.py b/application/service_sync/data_processing/tests/test_service_histories_change.py
@@ -137,12 +137,12 @@ def test_service_histories_change_get_change(mock_get_demographics_change_action
     # Act
     response = service_histories_change.get_change()
     # Assert
-    assert {
+    assert response == {
         "changetype": change_action,
         "data": DATA,
         "area": DOS_DEMOGRAPHICS_AREA_TYPE,
         "previous": PREVIOUS_VALUE,
-    } == response
+    }
 
 
 @patch(f"{FILE_PATH}.ServiceHistoriesChange.get_demographics_change_action")
@@ -157,8 +157,8 @@ def test_service_histories_change_get_change_add(mock_get_demographics_change_ac
     # Act
     response = service_histories_change.get_change()
     # Assert
-    assert {
+    assert response == {
         "changetype": change_action,
         "data": DATA,
         "area": DOS_DEMOGRAPHICS_AREA_TYPE,
-    } == response
+    }
diff --git a/application/service_sync/reject_pending_changes/pending_changes.py b/application/service_sync/reject_pending_changes/pending_changes.py
@@ -24,7 +24,7 @@
 class PendingChange:
     """A class representing a pending change from the DoS database with useful information about the change."""
 
-    id: str  # Id of the pending change from the change table  # noqa: A003
+    id: str  # Id of the pending change from the change table
     value: str  # Value of the pending change as a JSON string
     creatorsname: str  # User name of the user who made the change
     email: str  # Email address of the user who made the change
diff --git a/application/service_sync/requirements.txt b/application/service_sync/requirements.txt
@@ -1,3 +1,3 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
 psycopg[binary]
 pytz
diff --git a/application/slack_messenger/requirements.txt b/application/slack_messenger/requirements.txt
@@ -1,2 +1,2 @@
-aws-lambda-powertools[tracer] ~= 2.26.1
+aws-lambda-powertools[tracer] ~= 2.43.0
 requests
diff --git a/build/automation/init.mk b/build/automation/init.mk
@@ -765,6 +765,7 @@ endif
 
 ifeq (true, $(shell [ ! -f $(SETUP_COMPLETE_FLAG_FILE) ] && echo true))
 ifeq (true, $(shell [ $(SYSTEM_DIST) = "macos" ] && echo true))
+ifneq ("dumb", "$$TERM")
 # macOS: Xcode Command Line Tools
 ifneq (0, $(shell xcode-select -p > /dev/null 2>&1; echo $$?))
 $(info )
@@ -808,9 +809,6 @@ endif
 ifneq (0, $(shell which docker > /dev/null 2>&1; echo $$?))
 $(error $(shell tput setaf 202; echo "WARNING: Please, before proceeding install Docker"; tput sgr0))
 endif
-# *NIX: Docker Compose
-ifneq (0, $(shell which docker-compose > /dev/null 2>&1; echo $$?))
-$(error $(shell tput setaf 202; echo "WARNING: Please, before proceeding install Docker Compose"; tput sgr0))
 endif
 endif
 endif
diff --git a/build/automation/var/profile/perf2.mk b/build/automation/var/profile/perf2.mk
@@ -7,8 +7,8 @@ LOG_LEVEL := INFO
 
 # DB Name
 DB_CLUSTER_NAME := uec-core-dos-performance2-cluster-14
-DB_WRITER_NAME := uec-core-dos-performance2-cluster-14-one
-DB_READER_NAME := uec-core-dos-performance2-cluster-14-two
+DB_WRITER_NAME := uec-core-dos-performance2-cluster-14-two
+DB_READER_NAME := uec-core-dos-performance2-cluster-14-one
 
 # DB Route 53s
 DB_WRITER_ROUTE_53 := uec-core-dos-performance2-dos-primary-rw.dos-datastore-performance2
diff --git a/build/docker/lambda/Dockerfile b/build/docker/lambda/Dockerfile
@@ -1,6 +1,4 @@
-FROM public.ecr.aws/lambda/python:3.11-arm64
-# Update all packages
-RUN yum update -y
+FROM public.ecr.aws/lambda/python:3.12-arm64
 # Update Pip
 RUN python -m pip install --upgrade pip
 # Copy Python requirements
diff --git a/build/docker/tester/Dockerfile b/build/docker/tester/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11
+FROM python:3.12
 # Update Pip
 RUN python -m pip install --upgrade pip
 # Copy Python requirements
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/test/integration/steps/functions/dos/translation.py b/test/integration/steps/functions/dos/translation.py
diff --git a/test/pyproject.toml b/test/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-aws-lambda-powertools[tracer] ~= 2.26.1`
	`1`	`+aws-lambda-powertools[tracer] ~= 2.43.0`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-aws-lambda-powertools[tracer] ~= 2.26.1`
	`1`	`+aws-lambda-powertools[tracer] ~= 2.43.0`
`2`	`2`	`psycopg[binary]`