diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 4d5925959..72a09b901 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -38,7 +38,7 @@ jobs: -Dsonar.projectKey=nhsdigital_dos-integration -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.12 + -Dsonar.python.version=3.14 -Dsonar.exclusions=application/**/tests/** check-markdown-code-quality: diff --git a/.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt b/.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt index 85dd11711..871896a51 100644 --- a/.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt +++ b/.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt @@ -21,7 +21,7 @@ CodePipeline Xcode Tunnelblick // Environments -dev +[Dd]ev perf perf2 nonprod @@ -32,14 +32,20 @@ mgmt MGMT // Development/Deployment Terms adhoc +rebase +pytest healthcheck -runbook -Runbook +[Rr]unbooks? +Allowlist +slack_and_infrastructure +opening_times +hotfixes +automations undeploy Undeploy +undeployed Onboarding onboarding // Miscellaneous bbbbbb gggggg -[A-Z]+s diff --git a/README.md b/README.md index 330f7af0a..7b3d41dd6 100644 --- 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.12) +- Python (The project currently runs on Python 3.14) - AWS CLI - Docker/Podman @@ -192,7 +192,7 @@ To run ruff on you branch: List all the type of test suites included and provide instructions how to execute them -- Unit Testing +- Unit - Integration - Performance @@ -482,7 +482,7 @@ To quick update the lambdas run the following command. Note this only updates th ### Remove deployment with commit tag -You can remove a dev deployment using a single command to create a tag which then runs an AWS CodeBuild project that will remove that environment +You can remove a dev deployment using a single command to create a tag which then starts an AWS CodeBuild project that will remove that environment make tag-commit-to-destroy-environment ENVIRONMENT=[environment to destroy] COMMIT=[short commit hash] e.g. make tag-commit-to-destroy-environment ENVIRONMENT=ds-363 COMMIT=2bc43dd // This destroys the ds-363 dev environment diff --git a/build/automation/lib/terraform.mk b/build/automation/lib/terraform.mk index 491b0ae5d..d0cd4d11f 100644 --- a/build/automation/lib/terraform.mk +++ b/build/automation/lib/terraform.mk @@ -4,7 +4,7 @@ TERRAFORM_STATE_STORE = $(or $(TEXAS_TERRAFORM_STATE_STORE), state-store-$(AWS_A TERRAFORM_STATE_LOCK = $(or $(TEXAS_TERRAFORM_STATE_LOCK), state-lock-$(AWS_ACCOUNT_NAME)) TERRAFORM_STATE_KEY = $(PROJECT_GROUP_SHORT)-$(PROJECT_NAME_SHORT)/$(ENVIRONMENT) TERRAFORM_STATE_KEY_SHARED = texas -TERRAFORM_VERSION = $(or $(TEXAS_TERRAFORM_VERSION), 1.2.1) +TERRAFORM_VERSION = $(or $(TEXAS_TERRAFORM_VERSION), 1.13.0) # ============================================================================== diff --git a/build/docker/lambda/Dockerfile b/build/docker/lambda/Dockerfile index 333ad4347..e500a83a6 100644 --- a/build/docker/lambda/Dockerfile +++ b/build/docker/lambda/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/lambda/python:3.12-arm64 +FROM public.ecr.aws/lambda/python:3.14-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 index 11ee89a74..115c692fd 100644 --- a/build/docker/tester/Dockerfile +++ b/build/docker/tester/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12 +FROM python:3.14 # Update Pip RUN python -m pip install --upgrade pip # Copy Python requirements diff --git a/infrastructure/modules/s3/main.tf b/infrastructure/modules/s3/main.tf index 298f8edbc..b86176d69 100644 --- a/infrastructure/modules/s3/main.tf +++ b/infrastructure/modules/s3/main.tf @@ -8,7 +8,7 @@ #tfsec:ignore:aws-s3-specify-public-access-block module "s3_bucket" { source = "terraform-aws-modules/s3-bucket/aws" - version = "3.15.1" + version = "5.7.0" bucket = var.name acl = var.acl diff --git a/infrastructure/stacks/api-key/.terraform.lock.hcl b/infrastructure/stacks/api-key/.terraform.lock.hcl index 14e7319b5..9c637158d 100644 --- a/infrastructure/stacks/api-key/.terraform.lock.hcl +++ b/infrastructure/stacks/api-key/.terraform.lock.hcl @@ -2,25 +2,26 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.68.0" - constraints = "~> 5.68.0" + version = "6.14.1" + constraints = "~> 6.14.1" hashes = [ - "h1:C0VIWK9EIjEB17oy+sJoMprCJWrU6eQ8ZG5eWVZMejY=", - "zh:045f37b115a6c94a05c6a5f2aacfe4cecbaf4b40b56917ba852d988d487e94bf", - "zh:0c388f1a94e7941cf7e6abcd8d958a3e325e513cb60affa3cac82e75c7bbbb73", - "zh:15b1f2587c06bff35a15f2d1c22eab395d549908daf05582608d729cdf54ba40", - "zh:16a9c0c7fa7a33aa22313d4444aeecde20831bf51f9b481a0406e3cf583378fc", - "zh:3330c0d49fb329dff6de17913e1a774e75aa0913106c3197814c73c3a12a4c3f", - "zh:40920318f774ff397c7b6a01b5e89e46eb1a55d7dc9943a310669a9357b9b501", - "zh:838fbac358bb72f46c8d359a28a3effb6a9d7137cdd72b9e4d2f0fcf803dc462", - "zh:84e694c0720bf54b3b8521bf6e05700abe4a1b3e7dd2a104efd1eb55ae5866a0", - "zh:90606c399498027d7d07ab78a71b574a5d8b982c4372e6b67479f7e39e153e2f", - "zh:9162cf25d5c0fdf672c9bbc4c3c84dd87ab6a15b4971df1f32aea6b477c0e028", + "h1:XJ0I5WyuOLJvx7zWDOhcNPFFUJ0FP7yr5zfIUyYkHCs=", + "h1:zhJy/Td/sbOHJ4SuxGYH8PCbTd+KCapfeDD/7Swd6SY=", + "zh:14d0b4b3dffb3368e6257136bbab1f93d419863dd65d99ef80ca2c1dd3c72a1e", + "zh:1de3601251f87a0a989c4b3474baa2efcaf491804f8d7afe15421b728bac5dc5", + "zh:2cfe42b853a3b4117bdbb73e5715035eac9b8d753d6e653fd5f30a807a36b985", + "zh:3dd8a0336face356928faf2396065634739ef2c3ac3dcaa655570df205559fd9", + "zh:42712baca386b84e089b1db8b7844038557f4039b32d8702611aa67eadef7d0f", + "zh:4ffc698099e4d7ffc6b0490a4e78ad66b041afd54e988b8bf8e229bcdd4b3ead", + "zh:52a6a3b01cb34394b0d06b273b27702fb9d795290a02e5824e198315787e8446", + "zh:56eae388c48a844401e44811719dc23be84de538468fd12b7265b06acbf4b51d", + "zh:614a918fdf27416b2ee2ce1737895b791f59f9deff3b61246c62a992eabfb8eb", + "zh:68605e159177b57fdc4a26bb2caff69a7b69593a601145b7ab5a86fd44b28b9f", + "zh:771ac00fd5f211052d735ff0e4b9ec67288abd1e22ffea4ed774aec73c7e5687", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd8ec40a88b25e9f0f7d7f51460a921f4529554a260ffbe5083ddeba2f41ae3", - "zh:adeffac1d01a35bc8d2497ccceb9978b4746872143016c2c631de6cb38b6aa8d", - "zh:c7b682c81f9ae850669deb6239a66d8aa960abed984aad25db2d3954c09c2616", - "zh:d10b9f40934e14d55cfc5731d728507e50d014561322e9e0c84b33ab255a4d51", + "zh:a1355841161e5b53dc3078c88aae1972fd4a9c0d30309b18b1951137b96571fa", + "zh:a3c8ca40c1fa7ad76d3d4c3c0039b66a93cc96399e757d2caa0b5cdedce9d3e8", + "zh:c77e02a72ef9eb0eb65faaf84c33af843520622dbb51ec31d04ca371bd4d4ee8", ] } @@ -28,6 +29,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.3.2" constraints = "~> 3.3.0" hashes = [ + "h1:BgC3HcQhraeo8opJqoLm07Jcs4otOu2XrY2ppVeRMpg=", "h1:H5V+7iXol/EHB2+BUMzGlpIiCOdV74H8YjzCxnSAWcg=", "zh:038293aebfede983e45ee55c328e3fde82ae2e5719c9bd233c324cfacc437f9c", "zh:07eaeab03a723d83ac1cc218f3a59fceb7bbf301b38e89a26807d1c93c81cef8", diff --git a/infrastructure/stacks/api-key/terraform.tf b/infrastructure/stacks/api-key/terraform.tf index 88c25cd57..1fdc61969 100644 --- a/infrastructure/stacks/api-key/terraform.tf +++ b/infrastructure/stacks/api-key/terraform.tf @@ -5,9 +5,9 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.68.0" + version = "~> 6.14.1" } - template = { + random = { source = "hashicorp/random" version = "~> 3.3.0" } diff --git a/infrastructure/stacks/application/.terraform.lock.hcl b/infrastructure/stacks/application/.terraform.lock.hcl index 97226b71c..583265902 100644 --- a/infrastructure/stacks/application/.terraform.lock.hcl +++ b/infrastructure/stacks/application/.terraform.lock.hcl @@ -2,84 +2,88 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.68.0" - constraints = ">= 4.63.0, ~> 5.68.0" + version = "6.14.1" + constraints = ">= 6.0.0, ~> 6.14.1" hashes = [ - "h1:C0VIWK9EIjEB17oy+sJoMprCJWrU6eQ8ZG5eWVZMejY=", - "zh:045f37b115a6c94a05c6a5f2aacfe4cecbaf4b40b56917ba852d988d487e94bf", - "zh:0c388f1a94e7941cf7e6abcd8d958a3e325e513cb60affa3cac82e75c7bbbb73", - "zh:15b1f2587c06bff35a15f2d1c22eab395d549908daf05582608d729cdf54ba40", - "zh:16a9c0c7fa7a33aa22313d4444aeecde20831bf51f9b481a0406e3cf583378fc", - "zh:3330c0d49fb329dff6de17913e1a774e75aa0913106c3197814c73c3a12a4c3f", - "zh:40920318f774ff397c7b6a01b5e89e46eb1a55d7dc9943a310669a9357b9b501", - "zh:838fbac358bb72f46c8d359a28a3effb6a9d7137cdd72b9e4d2f0fcf803dc462", - "zh:84e694c0720bf54b3b8521bf6e05700abe4a1b3e7dd2a104efd1eb55ae5866a0", - "zh:90606c399498027d7d07ab78a71b574a5d8b982c4372e6b67479f7e39e153e2f", - "zh:9162cf25d5c0fdf672c9bbc4c3c84dd87ab6a15b4971df1f32aea6b477c0e028", + "h1:XJ0I5WyuOLJvx7zWDOhcNPFFUJ0FP7yr5zfIUyYkHCs=", + "h1:zhJy/Td/sbOHJ4SuxGYH8PCbTd+KCapfeDD/7Swd6SY=", + "zh:14d0b4b3dffb3368e6257136bbab1f93d419863dd65d99ef80ca2c1dd3c72a1e", + "zh:1de3601251f87a0a989c4b3474baa2efcaf491804f8d7afe15421b728bac5dc5", + "zh:2cfe42b853a3b4117bdbb73e5715035eac9b8d753d6e653fd5f30a807a36b985", + "zh:3dd8a0336face356928faf2396065634739ef2c3ac3dcaa655570df205559fd9", + "zh:42712baca386b84e089b1db8b7844038557f4039b32d8702611aa67eadef7d0f", + "zh:4ffc698099e4d7ffc6b0490a4e78ad66b041afd54e988b8bf8e229bcdd4b3ead", + "zh:52a6a3b01cb34394b0d06b273b27702fb9d795290a02e5824e198315787e8446", + "zh:56eae388c48a844401e44811719dc23be84de538468fd12b7265b06acbf4b51d", + "zh:614a918fdf27416b2ee2ce1737895b791f59f9deff3b61246c62a992eabfb8eb", + "zh:68605e159177b57fdc4a26bb2caff69a7b69593a601145b7ab5a86fd44b28b9f", + "zh:771ac00fd5f211052d735ff0e4b9ec67288abd1e22ffea4ed774aec73c7e5687", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd8ec40a88b25e9f0f7d7f51460a921f4529554a260ffbe5083ddeba2f41ae3", - "zh:adeffac1d01a35bc8d2497ccceb9978b4746872143016c2c631de6cb38b6aa8d", - "zh:c7b682c81f9ae850669deb6239a66d8aa960abed984aad25db2d3954c09c2616", - "zh:d10b9f40934e14d55cfc5731d728507e50d014561322e9e0c84b33ab255a4d51", + "zh:a1355841161e5b53dc3078c88aae1972fd4a9c0d30309b18b1951137b96571fa", + "zh:a3c8ca40c1fa7ad76d3d4c3c0039b66a93cc96399e757d2caa0b5cdedce9d3e8", + "zh:c77e02a72ef9eb0eb65faaf84c33af843520622dbb51ec31d04ca371bd4d4ee8", ] } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.4" + version = "2.3.5" constraints = ">= 1.0.0" hashes = [ - "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=", - "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb", - "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa", - "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0", - "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691", - "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb", - "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace", + "h1:IE3n531K7Agq3/pourJdsKV7l5EifBb09TXsb8shTXM=", + "h1:smKSos4zs57pJjQrNuvGBpSWth2el9SgePPbPHo0aps=", + "zh:6e89509d056091266532fa64de8c06950010498adf9070bf6ff85bc485a82562", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58", - "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f", - "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4", - "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202", - "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e", + "zh:86868aec05b58dc0aa1904646a2c26b9367d69b890c9ad70c33c0d3aa7b1485a", + "zh:a2ce38fda83a62fa5fb5a70e6ca8453b168575feb3459fa39803f6f40bd42154", + "zh:a6c72798f4a9a36d1d1433c0372006cc9b904e8cfd60a2ae03ac5b7d2abd2398", + "zh:a8a3141d2fc71c86bf7f3c13b0b3be8a1b0f0144a47572a15af4dfafc051e28a", + "zh:aa20a1242eb97445ad26ebcfb9babf2cd675bdb81cac5f989268ebefa4ef278c", + "zh:b58a22445fb8804e933dcf835ab06c29a0f33148dce61316814783ee7f4e4332", + "zh:cb5626a661ee761e0576defb2a2d75230a3244799d380864f3089c66e99d0dcc", + "zh:d1acb00d20445f682c4e705c965e5220530209c95609194c2dc39324f3d4fcce", + "zh:d91a254ba77b69a29d8eae8ed0e9367cbf0ea6ac1a85b58e190f8cb096a40871", + "zh:f6592327673c9f85cdb6f20336faef240abae7621b834f189c4a62276ea5db41", ] } provider "registry.terraform.io/hashicorp/local" { - version = "2.5.2" + version = "2.5.3" constraints = ">= 1.0.0" hashes = [ - "h1:JlMZD6nYqJ8sSrFfEAH0Vk/SL8WLZRmFaMUF9PJK5wM=", - "zh:136299545178ce281c56f36965bf91c35407c11897f7082b3b983d86cb79b511", - "zh:3b4486858aa9cb8163378722b642c57c529b6c64bfbfc9461d940a84cd66ebea", - "zh:4855ee628ead847741aa4f4fc9bed50cfdbf197f2912775dd9fe7bc43fa077c0", - "zh:4b8cd2583d1edcac4011caafe8afb7a95e8110a607a1d5fb87d921178074a69b", - "zh:52084ddaff8c8cd3f9e7bcb7ce4dc1eab00602912c96da43c29b4762dc376038", - "zh:71562d330d3f92d79b2952ffdda0dad167e952e46200c767dd30c6af8d7c0ed3", + "h1:1Nkh16jQJMp0EuDmvP/96f5Unnir0z12WyDuoR6HjMo=", + "h1:836ukDqJMp3wnHO5XX1T4H14LcRhrrD8XxGh/WtqzCY=", + "zh:284d4b5b572eacd456e605e94372f740f6de27b71b4e1fd49b63745d8ecd4927", + "zh:40d9dfc9c549e406b5aab73c023aa485633c1b6b730c933d7bcc2fa67fd1ae6e", + "zh:6243509bb208656eb9dc17d3c525c89acdd27f08def427a0dce22d5db90a4c8b", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:805f81ade06ff68fa8b908d31892eaed5c180ae031c77ad35f82cb7a74b97cf4", - "zh:8b6b3ebeaaa8e38dd04e56996abe80db9be6f4c1df75ac3cccc77642899bd464", - "zh:ad07750576b99248037b897de71113cc19b1a8d0bc235eb99173cc83d0de3b1b", - "zh:b9f1c3bfadb74068f5c205292badb0661e17ac05eb23bfe8bd809691e4583d0e", - "zh:cc4cbcd67414fefb111c1bf7ab0bc4beb8c0b553d01719ad17de9a047adff4d1", + "zh:885d85869f927853b6fe330e235cd03c337ac3b933b0d9ae827ec32fa1fdcdbf", + "zh:bab66af51039bdfcccf85b25fe562cbba2f54f6b3812202f4873ade834ec201d", + "zh:c505ff1bf9442a889ac7dca3ac05a8ee6f852e0118dd9a61796a2f6ff4837f09", + "zh:d36c0b5770841ddb6eaf0499ba3de48e5d4fc99f4829b6ab66b0fab59b1aaf4f", + "zh:ddb6a407c7f3ec63efb4dad5f948b54f7f4434ee1a2607a49680d494b1776fe1", + "zh:e0dafdd4500bec23d3ff221e3a9b60621c5273e5df867bc59ef6b7e41f5c91f6", + "zh:ece8742fd2882a8fc9d6efd20e2590010d43db386b920b2a9c220cfecc18de47", + "zh:f4c6b3eb8f39105004cf720e202f04f57e3578441cfb76ca27611139bc116a82", ] } provider "registry.terraform.io/hashicorp/null" { - version = "3.2.3" + version = "3.2.4" constraints = ">= 2.0.0" hashes = [ - "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=", - "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2", - "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d", - "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3", - "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f", - "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1", + "h1:hkf5w5B6q8e2A42ND2CjAvgvSN3puAosDmOJb3zCVQM=", + "h1:wTNrZnwQdOOT/TW9pa+7GgJeFK2OvTvDmx78VmUmZXM=", + "zh:59f6b52ab4ff35739647f9509ee6d93d7c032985d9f8c6237d1f8a59471bbbe2", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301", - "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670", - "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed", - "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65", - "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd", - "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5", + "zh:795c897119ff082133150121d39ff26cb5f89a730a2c8c26f3a9c1abf81a9c43", + "zh:7b9c7b16f118fbc2b05a983817b8ce2f86df125857966ad356353baf4bff5c0a", + "zh:85e33ab43e0e1726e5f97a874b8e24820b6565ff8076523cc2922ba671492991", + "zh:9d32ac3619cfc93eb3c4f423492a8e0f79db05fec58e449dee9b2d5873d5f69f", + "zh:9e15c3c9dd8e0d1e3731841d44c34571b6c97f5b95e8296a45318b94e5287a6e", + "zh:b4c2ab35d1b7696c30b64bf2c0f3a62329107bd1a9121ce70683dec58af19615", + "zh:c43723e8cc65bcdf5e0c92581dcbbdcbdcf18b8d2037406a5f2033b1e22de442", + "zh:ceb5495d9c31bfb299d246ab333f08c7fb0d67a4f82681fbf47f2a21c3e11ab5", + "zh:e171026b3659305c558d9804062762d168f50ba02b88b231d20ec99578a6233f", + "zh:ed0fe2acdb61330b01841fa790be00ec6beaac91d41f311fb8254f74eb6a711f", ] } diff --git a/infrastructure/stacks/application/lambda.tf b/infrastructure/stacks/application/lambda.tf index 4391cf1e1..d5b3fdbb7 100644 --- a/infrastructure/stacks/application/lambda.tf +++ b/infrastructure/stacks/application/lambda.tf @@ -1,6 +1,6 @@ module "change_event_dlq_handler_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.change_event_dlq_handler_lambda description = "Change Event DLQ Handler lambda" @@ -40,7 +40,7 @@ module "change_event_dlq_handler_lambda" { module "dos_db_handler_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.dos_db_handler_lambda description = "DoS DB Handler lambda" @@ -94,7 +94,7 @@ module "dos_db_handler_lambda" { module "dos_db_update_dlq_handler_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.dos_db_update_dlq_handler_lambda description = "DoS DB Update DLQ Handler lambda" @@ -133,7 +133,7 @@ module "dos_db_update_dlq_handler_lambda" { module "event_replay_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.event_replay_lambda description = "Event Replay lambda" @@ -175,7 +175,7 @@ module "event_replay_lambda" { module "ingest_change_event_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.ingest_change_event_lambda description = "Ingest Change Event lambda" @@ -216,7 +216,7 @@ module "ingest_change_event_lambda" { module "send_email_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.send_email_lambda description = "Send Email lambda" @@ -258,7 +258,7 @@ module "send_email_lambda" { module "service_matcher_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.service_matcher_lambda description = "Service Matcher lambda" @@ -311,7 +311,7 @@ module "service_matcher_lambda" { module "service_sync_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.service_sync_lambda description = "Service Sync lambda" @@ -371,7 +371,7 @@ module "service_sync_lambda" { module "slack_messenger_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.slack_messenger_lambda description = "Slack Messenger lambda" @@ -412,7 +412,7 @@ module "slack_messenger_lambda" { module "quality_checker_lambda" { source = "terraform-aws-modules/lambda/aws" - version = "v6.4.0" + version = "v8.1.0" function_name = var.quality_checker_lambda description = "Quality Checker lambda" diff --git a/infrastructure/stacks/application/terraform.tf b/infrastructure/stacks/application/terraform.tf index 43b5d8c92..5a3d2f3fc 100644 --- a/infrastructure/stacks/application/terraform.tf +++ b/infrastructure/stacks/application/terraform.tf @@ -5,7 +5,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.68.0" + version = "~> 6.14.1" } } } diff --git a/infrastructure/stacks/blue-green-link/.terraform.lock.hcl b/infrastructure/stacks/blue-green-link/.terraform.lock.hcl index 4806433af..be4eda64e 100644 --- a/infrastructure/stacks/blue-green-link/.terraform.lock.hcl +++ b/infrastructure/stacks/blue-green-link/.terraform.lock.hcl @@ -2,24 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.68.0" - constraints = "~> 5.68.0" + version = "6.14.1" + constraints = "~> 6.14.1" hashes = [ - "h1:C0VIWK9EIjEB17oy+sJoMprCJWrU6eQ8ZG5eWVZMejY=", - "zh:045f37b115a6c94a05c6a5f2aacfe4cecbaf4b40b56917ba852d988d487e94bf", - "zh:0c388f1a94e7941cf7e6abcd8d958a3e325e513cb60affa3cac82e75c7bbbb73", - "zh:15b1f2587c06bff35a15f2d1c22eab395d549908daf05582608d729cdf54ba40", - "zh:16a9c0c7fa7a33aa22313d4444aeecde20831bf51f9b481a0406e3cf583378fc", - "zh:3330c0d49fb329dff6de17913e1a774e75aa0913106c3197814c73c3a12a4c3f", - "zh:40920318f774ff397c7b6a01b5e89e46eb1a55d7dc9943a310669a9357b9b501", - "zh:838fbac358bb72f46c8d359a28a3effb6a9d7137cdd72b9e4d2f0fcf803dc462", - "zh:84e694c0720bf54b3b8521bf6e05700abe4a1b3e7dd2a104efd1eb55ae5866a0", - "zh:90606c399498027d7d07ab78a71b574a5d8b982c4372e6b67479f7e39e153e2f", - "zh:9162cf25d5c0fdf672c9bbc4c3c84dd87ab6a15b4971df1f32aea6b477c0e028", + "h1:XJ0I5WyuOLJvx7zWDOhcNPFFUJ0FP7yr5zfIUyYkHCs=", + "h1:zhJy/Td/sbOHJ4SuxGYH8PCbTd+KCapfeDD/7Swd6SY=", + "zh:14d0b4b3dffb3368e6257136bbab1f93d419863dd65d99ef80ca2c1dd3c72a1e", + "zh:1de3601251f87a0a989c4b3474baa2efcaf491804f8d7afe15421b728bac5dc5", + "zh:2cfe42b853a3b4117bdbb73e5715035eac9b8d753d6e653fd5f30a807a36b985", + "zh:3dd8a0336face356928faf2396065634739ef2c3ac3dcaa655570df205559fd9", + "zh:42712baca386b84e089b1db8b7844038557f4039b32d8702611aa67eadef7d0f", + "zh:4ffc698099e4d7ffc6b0490a4e78ad66b041afd54e988b8bf8e229bcdd4b3ead", + "zh:52a6a3b01cb34394b0d06b273b27702fb9d795290a02e5824e198315787e8446", + "zh:56eae388c48a844401e44811719dc23be84de538468fd12b7265b06acbf4b51d", + "zh:614a918fdf27416b2ee2ce1737895b791f59f9deff3b61246c62a992eabfb8eb", + "zh:68605e159177b57fdc4a26bb2caff69a7b69593a601145b7ab5a86fd44b28b9f", + "zh:771ac00fd5f211052d735ff0e4b9ec67288abd1e22ffea4ed774aec73c7e5687", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd8ec40a88b25e9f0f7d7f51460a921f4529554a260ffbe5083ddeba2f41ae3", - "zh:adeffac1d01a35bc8d2497ccceb9978b4746872143016c2c631de6cb38b6aa8d", - "zh:c7b682c81f9ae850669deb6239a66d8aa960abed984aad25db2d3954c09c2616", - "zh:d10b9f40934e14d55cfc5731d728507e50d014561322e9e0c84b33ab255a4d51", + "zh:a1355841161e5b53dc3078c88aae1972fd4a9c0d30309b18b1951137b96571fa", + "zh:a3c8ca40c1fa7ad76d3d4c3c0039b66a93cc96399e757d2caa0b5cdedce9d3e8", + "zh:c77e02a72ef9eb0eb65faaf84c33af843520622dbb51ec31d04ca371bd4d4ee8", ] } diff --git a/infrastructure/stacks/blue-green-link/terraform.tf b/infrastructure/stacks/blue-green-link/terraform.tf index 43b5d8c92..5a3d2f3fc 100755 --- a/infrastructure/stacks/blue-green-link/terraform.tf +++ b/infrastructure/stacks/blue-green-link/terraform.tf @@ -5,7 +5,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.68.0" + version = "~> 6.14.1" } } } diff --git a/infrastructure/stacks/development-and-deployment-tools/.terraform.lock.hcl b/infrastructure/stacks/development-and-deployment-tools/.terraform.lock.hcl index 198813e8d..666d446b0 100644 --- a/infrastructure/stacks/development-and-deployment-tools/.terraform.lock.hcl +++ b/infrastructure/stacks/development-and-deployment-tools/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.32.1" - constraints = ">= 4.9.0, ~> 5.32.1" + version = "6.14.1" + constraints = ">= 4.9.0, ~> 6.14.1" hashes = [ - "h1:VMmGHDV8nrn1YITcB5PH7/+bgAdoyNJqjyiRpGp3Rhw=", - "zh:0c603e0ea9ec481f1588ca44d3464fe43ed936a8452e0c70d347c8e71a1b19a4", - "zh:0d43c845330ea4aaa152caf35819069215fcf17e4468b9d94c631f7d4178b1ac", - "zh:1211275208e8142bfa27987fdeb3eae40075ff569bf198330975f470bc4f5137", - "zh:1d8e7e4a2ff45a8b56037d030e2978fc04007941f62f1e265e251801a1d0c3cc", - "zh:4f6a8a6c9413b8b9267673cb7fb9dee7dc81946f7cc17d23e2104304f4ec4472", - "zh:6d769c74f8157260a37a32a1036b77f9795e21df2df7cadf4c7acc85b2dfd96e", - "zh:778fd9bf80424a62ebf5f059dcabfc4a588b0791ba18c1cf727bbdc1aed40351", - "zh:7bf1b063065bbe39b71e2a5895915fcbcc0cf7f553f84388e81888506d292fce", + "h1:zhJy/Td/sbOHJ4SuxGYH8PCbTd+KCapfeDD/7Swd6SY=", + "zh:14d0b4b3dffb3368e6257136bbab1f93d419863dd65d99ef80ca2c1dd3c72a1e", + "zh:1de3601251f87a0a989c4b3474baa2efcaf491804f8d7afe15421b728bac5dc5", + "zh:2cfe42b853a3b4117bdbb73e5715035eac9b8d753d6e653fd5f30a807a36b985", + "zh:3dd8a0336face356928faf2396065634739ef2c3ac3dcaa655570df205559fd9", + "zh:42712baca386b84e089b1db8b7844038557f4039b32d8702611aa67eadef7d0f", + "zh:4ffc698099e4d7ffc6b0490a4e78ad66b041afd54e988b8bf8e229bcdd4b3ead", + "zh:52a6a3b01cb34394b0d06b273b27702fb9d795290a02e5824e198315787e8446", + "zh:56eae388c48a844401e44811719dc23be84de538468fd12b7265b06acbf4b51d", + "zh:614a918fdf27416b2ee2ce1737895b791f59f9deff3b61246c62a992eabfb8eb", + "zh:68605e159177b57fdc4a26bb2caff69a7b69593a601145b7ab5a86fd44b28b9f", + "zh:771ac00fd5f211052d735ff0e4b9ec67288abd1e22ffea4ed774aec73c7e5687", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b57506c3f46e850543fc1ee9522f231311e8540730db76bbf7a3f4d81777a4bd", - "zh:d37c8655b2a31435a116a1af7031f2bcdecf4c7e7e74903b88203798fb39043e", - "zh:db369802896eb10bbfed00bf3bd568b35fb5d903d3624d555b6574c5c4e2d94e", - "zh:e9992bfccf8205c495aebb7da917404496f96b5d3ea4a915a8884994ca8d860c", - "zh:ed1e0ef83cde313f1ccb3e18fc9dc63bf6ca473ec07554df5e24c706708a6866", - "zh:f0d19ed41352da9be308dff72899ecf5af7a42b592cf37fb98e9064e7622d35e", + "zh:a1355841161e5b53dc3078c88aae1972fd4a9c0d30309b18b1951137b96571fa", + "zh:a3c8ca40c1fa7ad76d3d4c3c0039b66a93cc96399e757d2caa0b5cdedce9d3e8", + "zh:c77e02a72ef9eb0eb65faaf84c33af843520622dbb51ec31d04ca371bd4d4ee8", ] } diff --git a/infrastructure/stacks/development-and-deployment-tools/terraform.tf b/infrastructure/stacks/development-and-deployment-tools/terraform.tf index dd732c88d..72c864eef 100644 --- a/infrastructure/stacks/development-and-deployment-tools/terraform.tf +++ b/infrastructure/stacks/development-and-deployment-tools/terraform.tf @@ -5,7 +5,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.32.1" + version = "~> 6.14.1" } template = { source = "hashicorp/template" diff --git a/infrastructure/stacks/shared-resources/.terraform.lock.hcl b/infrastructure/stacks/shared-resources/.terraform.lock.hcl index dba7f7f07..536d1b3ad 100644 --- a/infrastructure/stacks/shared-resources/.terraform.lock.hcl +++ b/infrastructure/stacks/shared-resources/.terraform.lock.hcl @@ -2,43 +2,45 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.68.0" - constraints = ">= 4.9.0, ~> 5.68.0" + version = "6.14.1" + constraints = ">= 6.5.0, ~> 6.14.1" hashes = [ - "h1:C0VIWK9EIjEB17oy+sJoMprCJWrU6eQ8ZG5eWVZMejY=", - "zh:045f37b115a6c94a05c6a5f2aacfe4cecbaf4b40b56917ba852d988d487e94bf", - "zh:0c388f1a94e7941cf7e6abcd8d958a3e325e513cb60affa3cac82e75c7bbbb73", - "zh:15b1f2587c06bff35a15f2d1c22eab395d549908daf05582608d729cdf54ba40", - "zh:16a9c0c7fa7a33aa22313d4444aeecde20831bf51f9b481a0406e3cf583378fc", - "zh:3330c0d49fb329dff6de17913e1a774e75aa0913106c3197814c73c3a12a4c3f", - "zh:40920318f774ff397c7b6a01b5e89e46eb1a55d7dc9943a310669a9357b9b501", - "zh:838fbac358bb72f46c8d359a28a3effb6a9d7137cdd72b9e4d2f0fcf803dc462", - "zh:84e694c0720bf54b3b8521bf6e05700abe4a1b3e7dd2a104efd1eb55ae5866a0", - "zh:90606c399498027d7d07ab78a71b574a5d8b982c4372e6b67479f7e39e153e2f", - "zh:9162cf25d5c0fdf672c9bbc4c3c84dd87ab6a15b4971df1f32aea6b477c0e028", + "h1:XJ0I5WyuOLJvx7zWDOhcNPFFUJ0FP7yr5zfIUyYkHCs=", + "h1:zhJy/Td/sbOHJ4SuxGYH8PCbTd+KCapfeDD/7Swd6SY=", + "zh:14d0b4b3dffb3368e6257136bbab1f93d419863dd65d99ef80ca2c1dd3c72a1e", + "zh:1de3601251f87a0a989c4b3474baa2efcaf491804f8d7afe15421b728bac5dc5", + "zh:2cfe42b853a3b4117bdbb73e5715035eac9b8d753d6e653fd5f30a807a36b985", + "zh:3dd8a0336face356928faf2396065634739ef2c3ac3dcaa655570df205559fd9", + "zh:42712baca386b84e089b1db8b7844038557f4039b32d8702611aa67eadef7d0f", + "zh:4ffc698099e4d7ffc6b0490a4e78ad66b041afd54e988b8bf8e229bcdd4b3ead", + "zh:52a6a3b01cb34394b0d06b273b27702fb9d795290a02e5824e198315787e8446", + "zh:56eae388c48a844401e44811719dc23be84de538468fd12b7265b06acbf4b51d", + "zh:614a918fdf27416b2ee2ce1737895b791f59f9deff3b61246c62a992eabfb8eb", + "zh:68605e159177b57fdc4a26bb2caff69a7b69593a601145b7ab5a86fd44b28b9f", + "zh:771ac00fd5f211052d735ff0e4b9ec67288abd1e22ffea4ed774aec73c7e5687", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9cd8ec40a88b25e9f0f7d7f51460a921f4529554a260ffbe5083ddeba2f41ae3", - "zh:adeffac1d01a35bc8d2497ccceb9978b4746872143016c2c631de6cb38b6aa8d", - "zh:c7b682c81f9ae850669deb6239a66d8aa960abed984aad25db2d3954c09c2616", - "zh:d10b9f40934e14d55cfc5731d728507e50d014561322e9e0c84b33ab255a4d51", + "zh:a1355841161e5b53dc3078c88aae1972fd4a9c0d30309b18b1951137b96571fa", + "zh:a3c8ca40c1fa7ad76d3d4c3c0039b66a93cc96399e757d2caa0b5cdedce9d3e8", + "zh:c77e02a72ef9eb0eb65faaf84c33af843520622dbb51ec31d04ca371bd4d4ee8", ] } provider "registry.terraform.io/hashicorp/time" { - version = "0.12.1" + version = "0.13.1" hashes = [ - "h1:6BhxSYBJdBBKyuqatOGkuPKVenfx6UmLdiI13Pb3his=", - "zh:090023137df8effe8804e81c65f636dadf8f9d35b79c3afff282d39367ba44b2", - "zh:26f1e458358ba55f6558613f1427dcfa6ae2be5119b722d0b3adb27cd001efea", - "zh:272ccc73a03384b72b964918c7afeb22c2e6be22460d92b150aaf28f29a7d511", - "zh:438b8c74f5ed62fe921bd1078abe628a6675e44912933100ea4fa26863e340e9", + "h1:+W+DMrVoVnoXo3f3M4W+OpZbkCrUn6PnqDF33D2Cuf0=", + "h1:P9h9GNlrWPECzIvIFjHOhF+HVzpxk0eCcdy1G0fWSHw=", + "zh:02cb9aab1002f0f2a94a4f85acec8893297dc75915f7404c165983f720a54b74", + "zh:04429b2b31a492d19e5ecf999b116d396dac0b24bba0d0fb19ecaefe193fdb8f", + "zh:26f8e51bb7c275c404ba6028c1b530312066009194db721a8427a7bc5cdbc83a", + "zh:772ff8dbdbef968651ab3ae76d04afd355c32f8a868d03244db3f8496e462690", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:85c8bd8eefc4afc33445de2ee7fbf33a7807bc34eb3734b8eefa4e98e4cddf38", - "zh:98bbe309c9ff5b2352de6a047e0ec6c7e3764b4ed3dfd370839c4be2fbfff869", - "zh:9c7bf8c56da1b124e0e2f3210a1915e778bab2be924481af684695b52672891e", - "zh:d2200f7f6ab8ecb8373cda796b864ad4867f5c255cff9d3b032f666e4c78f625", - "zh:d8c7926feaddfdc08d5ebb41b03445166df8c125417b28d64712dccd9feef136", - "zh:e2412a192fc340c61b373d6c20c9d805d7d3dee6c720c34db23c2a8ff0abd71b", - "zh:e6ac6bba391afe728a099df344dbd6481425b06d61697522017b8f7a59957d44", + "zh:898db5d2b6bd6ca5457dccb52eedbc7c5b1a71e4a4658381bcbb38cedbbda328", + "zh:8de913bf09a3fa7bedc29fec18c47c571d0c7a3d0644322c46f3aa648cf30cd8", + "zh:9402102c86a87bdfe7e501ffbb9c685c32bbcefcfcf897fd7d53df414c36877b", + "zh:b18b9bb1726bb8cfbefc0a29cf3657c82578001f514bcf4c079839b6776c47f0", + "zh:b9d31fdc4faecb909d7c5ce41d2479dd0536862a963df434be4b16e8e4edc94d", + "zh:c951e9f39cca3446c060bd63933ebb89cedde9523904813973fbc3d11863ba75", + "zh:e5b773c0d07e962291be0e9b413c7a22c044b8c7b58c76e8aa91d1659990dfb5", ] } diff --git a/infrastructure/stacks/shared-resources/terraform.tf b/infrastructure/stacks/shared-resources/terraform.tf index 43b5d8c92..5a3d2f3fc 100755 --- a/infrastructure/stacks/shared-resources/terraform.tf +++ b/infrastructure/stacks/shared-resources/terraform.tf @@ -5,7 +5,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.68.0" + version = "~> 6.14.1" } } } diff --git a/pyproject.toml b/pyproject.toml index 0f44a425a..446a26d8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -135,7 +135,7 @@ line-length = 120 # Allow unused variables when underscore-prefixed. lint.dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" -# Set target version to Python 3.12. +# Set target version to Python 3.14. target-version = "py312" [tool.ruff.lint.per-file-ignores] diff --git a/test/pyproject.toml b/test/pyproject.toml index b734dba11..0665f8aec 100644 --- a/test/pyproject.toml +++ b/test/pyproject.toml @@ -15,8 +15,9 @@ lint.ignore = [ "DTZ007", # the use of `datetime.datetime.strptime()` without %z must be followed by `.replace(tzinfo=)` or `.astimezone()` ] -# Set python version to 3.12. -target-version = "py312" +# Ruff currently supports up to Python 3.13; use py313 as target until py314 is released upstream. +# (Runtime may be 3.14; this setting only affects linting's syntax features.) +target-version = "py313" [tool.ruff.lint.per-file-ignores] "**test_*.py" = ["S101"] # Allow `assert` in tests.