MESH-2092 update deps and add three more client accessors

Author: davidhallam4-nhs

.github/workflows/merge-develop.yml

@@ -23,7 +23,7 @@ jobs:
       - name: setup poetry
         uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.5.1
+          poetry-version: 2.1.4
 
       - name: add poetry plugins
         run: |
@@ -115,7 +115,7 @@ jobs:
       - name: setup poetry
         uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.5.1
+          poetry-version: 2.1.4
 
       - name: add poetry plugins
         run: |

.github/workflows/pull-request.yml

@@ -103,7 +103,7 @@ jobs:
       - name: setup poetry
         uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.5.1
+          poetry-version: 2.1.4
 
       - name: add poetry plugins
         run: |
@@ -220,7 +220,7 @@ jobs:
       - name: setup poetry
         uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.5.1
+          poetry-version: 2.1.4
 
       - name: add poetry plugins
         run: |
@@ -305,7 +305,7 @@ jobs:
       - name: setup poetry
         uses: abatilo/actions-poetry@v4
         with:
-          poetry-version: 1.5.1
+          poetry-version: 2.1.4
 
       - name: add poetry plugins
         run: |

.tool-versions

@@ -1,2 +1,2 @@
-poetry 1.8.5
-python 3.10.12 3.9.12 3.11.5
+poetry 2.1.4
+python 3.13.5 3.12.11 3.11.13 3.10.18 3.9.23

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 services:
 
   localstack:

nhs_aws_helpers/__init__.py

@@ -44,11 +44,15 @@
     StandardRetryConditions,
 )
 from mypy_boto3_athena import AthenaClient
+from mypy_boto3_backup import BackupClient
+from mypy_boto3_ce import CostExplorerClient
+from mypy_boto3_cloudwatch import CloudWatchClient
 from mypy_boto3_dynamodb.client import DynamoDBClient
 from mypy_boto3_dynamodb.service_resource import DynamoDBServiceResource, Table
 from mypy_boto3_dynamodb.type_defs import KeysAndAttributesTypeDef
 from mypy_boto3_events import EventBridgeClient
 from mypy_boto3_firehose import FirehoseClient
+from mypy_boto3_glue import GlueClient
 from mypy_boto3_kms.client import KMSClient
 from mypy_boto3_lambda.client import LambdaClient
 from mypy_boto3_logs.client import CloudWatchLogsClient
@@ -183,6 +187,10 @@ def s3_client(session: Optional[Session] = None, config: Optional[Config] = None
     return _aws("s3", "client", session, config)  # type: ignore[no-any-return]
 
 
+def backup_client(session: Optional[Session] = None, config: Optional[Config] = None) -> BackupClient:
+    return _aws("backup", "client", session, config)  # type: ignore[no-any-return]
+
+
 def register_retry_handler(
     client_or_resource: Union[S3ServiceResource, S3Client],
     on_error: Optional[Callable] = None,
@@ -305,6 +313,18 @@ def secrets_client(session: Optional[Session] = None, config: Optional[Config] =
     return _aws("secretsmanager", "client", session, config)  # type: ignore[no-any-return]
 
 
+def glue_client(session: Optional[Session] = None, config: Optional[Config] = None) -> GlueClient:
+    return _aws("glue", "client", session, config)  # type: ignore[no-any-return]
+
+
+def cost_explorer_client(session: Optional[Session] = None, config: Optional[Config] = None) -> CostExplorerClient:
+    return _aws("ce", "client", session, config)  # type: ignore[no-any-return]
+
+
+def cloudwatch_client(session: Optional[Session] = None, config: Optional[Config] = None) -> CloudWatchClient:
+    return _aws("cloudwatch", "client", session, config)  # type: ignore[no-any-return]
+
+
 def secret_value(name: str, session: Optional[Session] = None, config: Optional[Config] = None) -> str:
     return secrets_client(session=session, config=config).get_secret_value(SecretId=name)["SecretString"]
 

poetry.lock

@@ -15,7 +15,7 @@ repository = "https://github.com/NHSDigital/nhs-aws-helpers"
 # core dependencies
 python = ">=3.9,<4.0"
 boto3 = "^1.38.14"
-boto3-stubs = {extras = ["s3", "ssm", "secretsmanager", "dynamodb", "stepfunctions", "sqs", "lambda", "logs", "ses", "sns", "events", "kms", "firehose", "athena"], version = "^1.38.6"}
+boto3-stubs = {extras = ["s3", "ssm", "secretsmanager", "dynamodb", "stepfunctions", "sqs", "lambda", "logs", "ses", "sns", "events", "kms", "firehose", "athena", "glue", "ce", "cloudwatch", "backup"], version = "^1.38.6"}
 botocore-stubs = "^1.38.46"
 
 
@@ -43,7 +43,7 @@ pytest = ["pytest", "petname"]
 
 [tool.black]
 line-length = 120
-target-version = ['py39', 'py310', 'py311']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 include = '\.pyi?$'
 #extend-exclude = '''
 #/(
@@ -139,13 +139,15 @@ check_untyped_defs = true
 [tool.tox]
 legacy_tox_ini = """
 [tox]
-envlist = py39,py310,py311
+envlist = py39,py310,py311,py312,py313
 
 [gh-actions]
 python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
+    3.13: py313
 
 [testenv]
 deps =