diff --git a/.github/workflows/analysis-codeql.yml b/.github/workflows/analysis-codeql.yml index 463dfe0d..49d1c1d5 100644 --- a/.github/workflows/analysis-codeql.yml +++ b/.github/workflows/analysis-codeql.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3.25.3 + uses: github/codeql-action/init@v3.27.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3.25.3 + uses: github/codeql-action/autobuild@v3.27.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3.25.3 \ No newline at end of file + uses: github/codeql-action/analyze@v3.27.8 \ No newline at end of file diff --git a/.github/workflows/analysis-tfsec-to-github-security.yml b/.github/workflows/analysis-tfsec-to-github-security.yml index 9f240812..d4ea2e85 100644 --- a/.github/workflows/analysis-tfsec-to-github-security.yml +++ b/.github/workflows/analysis-tfsec-to-github-security.yml @@ -32,6 +32,6 @@ jobs: with: sarif_file: tfsec.sarif - name: Upload SARIF file - uses: github/codeql-action/upload-sarif@v3.25.3 + uses: github/codeql-action/upload-sarif@v3.27.8 with: sarif_file: tfsec.sarif \ No newline at end of file diff --git a/docs/support_scripts/load_testing/go.mod b/docs/support_scripts/load_testing/go.mod index 8afd3100..0cf77272 100644 --- a/docs/support_scripts/load_testing/go.mod +++ b/docs/support_scripts/load_testing/go.mod @@ -2,6 +2,6 @@ module load_testing go 1.20 -require github.com/aws/aws-sdk-go v1.52.2 +require github.com/aws/aws-sdk-go v1.55.5 require github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/docs/support_scripts/load_testing/go.sum b/docs/support_scripts/load_testing/go.sum index e4567b2c..2a6c83ef 100644 --- a/docs/support_scripts/load_testing/go.sum +++ b/docs/support_scripts/load_testing/go.sum @@ -2,6 +2,8 @@ github.com/aws/aws-sdk-go v1.44.281 h1:z/ptheJvINaIAsKXthxONM+toTKw2pxyk700Hfm6y github.com/aws/aws-sdk-go v1.44.281/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.52.2 h1:l4g9wBXRBlvCtScvv4iLZCzLCtR7BFJcXOnOGQ20orw= github.com/aws/aws-sdk-go v1.52.2/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= diff --git a/docs/support_scripts/requests/go.mod b/docs/support_scripts/requests/go.mod index 7bfc5699..f09c10af 100644 --- a/docs/support_scripts/requests/go.mod +++ b/docs/support_scripts/requests/go.mod @@ -2,6 +2,6 @@ module api_request go 1.20 -require github.com/aws/aws-sdk-go v1.52.2 +require github.com/aws/aws-sdk-go v1.55.5 require github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/docs/support_scripts/requests/go.sum b/docs/support_scripts/requests/go.sum index 66934d1b..ad683e67 100644 --- a/docs/support_scripts/requests/go.sum +++ b/docs/support_scripts/requests/go.sum @@ -2,6 +2,8 @@ github.com/aws/aws-sdk-go v1.44.284 h1:Oc5Kubi43/VCkerlt3ZU3KpBju6BpNkoG3s7E8vj/ github.com/aws/aws-sdk-go v1.44.284/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.52.2 h1:l4g9wBXRBlvCtScvv4iLZCzLCtR7BFJcXOnOGQ20orw= github.com/aws/aws-sdk-go v1.52.2/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= diff --git a/integration_tests/v1/requirements.txt b/integration_tests/v1/requirements.txt index b150b29c..e4298fdd 100644 --- a/integration_tests/v1/requirements.txt +++ b/integration_tests/v1/requirements.txt @@ -1,10 +1,10 @@ -pytest==8.2.0 -pytest-env==1.1.3 +pytest==8.3.4 +pytest-env==1.1.5 pytest-xdist==3.6.1 pytest-html==4.1.1 -requests_aws4auth==1.2.3 -boto3==1.34.98 -jsonschema==4.22.0 -fakeredis==2.22.0 -flask==3.0.3 -coverage==7.5.0 \ No newline at end of file +requests_aws4auth==1.3.1 +boto3==1.35.80 +jsonschema==4.23.0 +fakeredis==2.26.1 +flask==3.1.0 +coverage==7.6.9 \ No newline at end of file diff --git a/lambda_functions/v1/Dockerfile-Function b/lambda_functions/v1/Dockerfile-Function index 0c3cca6d..8939068d 100644 --- a/lambda_functions/v1/Dockerfile-Function +++ b/lambda_functions/v1/Dockerfile-Function @@ -1,4 +1,4 @@ -FROM public.ecr.aws/lambda/python:3.12 +FROM public.ecr.aws/lambda/python:3.13 COPY lambda_functions/v1/functions/lpa/ ${LAMBDA_TASK_ROOT} diff --git a/lambda_functions/v1/Dockerfile-tests b/lambda_functions/v1/Dockerfile-tests index ccbe78ba..4d2e4cc0 100644 --- a/lambda_functions/v1/Dockerfile-tests +++ b/lambda_functions/v1/Dockerfile-tests @@ -1,4 +1,4 @@ -FROM public.ecr.aws/lambda/python:3.12 +FROM public.ecr.aws/lambda/python:3.13 COPY /functions/lpa/ ${LAMBDA_TASK_ROOT}/lambda_functions/v1/functions/lpa COPY /tests/ ${LAMBDA_TASK_ROOT}/lambda_functions/v1/tests diff --git a/lambda_functions/v1/requirements/dev-requirements.txt b/lambda_functions/v1/requirements/dev-requirements.txt index eef632b9..7c226105 100644 --- a/lambda_functions/v1/requirements/dev-requirements.txt +++ b/lambda_functions/v1/requirements/dev-requirements.txt @@ -1,16 +1,16 @@ -connexion==3.0.6 -fakeredis==2.22.0 -flake8==7.0.0 +connexion==3.1.0 +fakeredis==2.26.1 +flake8==7.1.1 flake8-quotes==3.4.0 -hypothesis==6.100.2 -moto==5.0.6 -pytest==8.2.0 +hypothesis==6.122.3 +moto==5.0.22 +pytest==8.3.4 pytest-cov==6.0.0 -pytest-env==1.1.3 +pytest-env==1.1.5 pytest-html==4.1.1 tenacity==9.0.0 -validators==0.28.1 -yarl==1.9.4 -importlib-metadata==8.0.0 +validators==0.34.0 +yarl==1.18.3 +importlib-metadata==8.5.0 opg-sirius-service==2.1.1 -typing-extensions==4.11.0 \ No newline at end of file +typing-extensions==4.12.2 \ No newline at end of file diff --git a/lambda_functions/v1/requirements/pact-requirements.txt b/lambda_functions/v1/requirements/pact-requirements.txt index 7914e7df..b6ee87ce 100644 --- a/lambda_functions/v1/requirements/pact-requirements.txt +++ b/lambda_functions/v1/requirements/pact-requirements.txt @@ -1,3 +1,3 @@ -connexion==3.0.6 +connexion==3.1.0 swagger-ui-bundle requests diff --git a/lambda_functions/v1/requirements/requirements.txt b/lambda_functions/v1/requirements/requirements.txt index 37e871f1..1c26cc80 100644 --- a/lambda_functions/v1/requirements/requirements.txt +++ b/lambda_functions/v1/requirements/requirements.txt @@ -1,9 +1,9 @@ #Update this date to trigger update of layers: 20230619 -Flask==3.0.3 -markupsafe==3.0.0 -localstack-client==2.5 -redis==5.0.4 -requests==2.32.0 -Werkzeug==3.0.6 -requests-aws4auth==1.0.1 +Flask==3.1.0 +markupsafe==3.0.2 +localstack-client==2.7 +redis==5.2.1 +requests==2.32.3 +Werkzeug==3.1.3 +requests-aws4auth==1.3.1 opg-sirius-service==2.1.1 diff --git a/mock_sirius_backend/Dockerfile b/mock_sirius_backend/Dockerfile index 2f4b9296..19b03c02 100644 --- a/mock_sirius_backend/Dockerfile +++ b/mock_sirius_backend/Dockerfile @@ -1,5 +1,5 @@ # our base image -FROM python:3.12-slim +FROM python:3.13-slim WORKDIR /var/www/ COPY requirements.txt . diff --git a/mock_sirius_backend/requirements.txt b/mock_sirius_backend/requirements.txt index 76b5a06b..4dc8244b 100644 --- a/mock_sirius_backend/requirements.txt +++ b/mock_sirius_backend/requirements.txt @@ -1,4 +1,4 @@ -connexion==3.0.6 -Flask==3.0.3 -markupsafe==3.0.0 +connexion==3.1.0 +Flask==3.1.0 +markupsafe==3.0.2 requests diff --git a/terraform/environment/.terraform.lock.hcl b/terraform/environment/.terraform.lock.hcl index e5adb983..d74fc928 100644 --- a/terraform/environment/.terraform.lock.hcl +++ b/terraform/environment/.terraform.lock.hcl @@ -2,38 +2,38 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.70.0" + version = "5.81.0" constraints = "~> 5.0, >= 5.32.0" hashes = [ - "h1:+QN8de63DAE4QbyODwK14T9ZEKasvRwLMSItMOWoU2Q=", - "h1:BLUSi84tN1hAVGIjp7Jz+5cFJglP4NfHtvKlRpPeOCg=", - "h1:CpqVkF4tQ2xVpiHDd29jrlcxphtGEQGCak5u9wu1Fxc=", - "h1:F0Xy1oGTyjjr4VLvCuscnjuIP26roJhveM87hZIcU3E=", - "h1:Ixv4l0u2CgI4IfEntHOHmk2UlbVuO2JgLflsLCcuPJo=", - "h1:LKnWZnujHcQPm3MAk4elP3H9VXNjlO6rNqlO5s330Yg=", - "h1:O9TDLI3FOmtp01iL7vzPZNKbc3B/iDDaEak5JbT/BqI=", - "h1:d+1BZLpGjhmdKKLc6NMLK/Nedq24E12PpKfq681fASk=", - "h1:eC8TYI3alHbmeCE9zTg0/nFJ47JA0mlSZ8rFfdXYT+g=", - "h1:k0YZF1eY5txnKXfm41X5AqtuHYdZGoNmEvb6je4f+mc=", - "h1:kcKscQCmMLrNMAkaL4XIqGGq4uk8vXthNRvtfersNH0=", - "h1:kw2JHmUSpqQOihkCpBeJ2p+YyMRrNMj1IuMFf7J7coE=", - "h1:t4nYlah7xW8AJBZ+jIgu9fN/vuQrSqM50bd3dN2dfWc=", - "h1:uepnIabzlyNxxxRi5EWfaJLaDjxMrH5oaxBbxmhPDT8=", - "zh:09cbec93c324e6f03a866244ecb2bae71fdf1f5d3d981e858b745c90606b6b6d", - "zh:19685d9f4c9ddcfa476a9a428c6c612be4a1b4e8e1198fbcbb76436b735284ee", - "zh:3358ee6a2b24c982b7c83fac0af6898644d1bbdabf9c4e0589e91e427641ba88", - "zh:34f9f2936de7384f8ed887abdbcb54aea1ce7b0cf2e85243a3fd3904d024747f", - "zh:4a99546cc2140304c90d9ccb9db01589d4145863605a0fcd90027a643ea3ec5d", - "zh:4da32fec0e10dab5aa3dea3c9fe57adc973cc73a71f5d59da3f65d85d925dc3f", - "zh:659cf94522bc38ce0af70f7b0371b2941a0e0bcad02d17c1a7b264575fe07224", - "zh:6f1c172c9b98bc86e4f0526872098ee3246c2620f7b323ce0c2ce6427987f7d2", - "zh:79bf8fb8f37c308742e287694a9de081ff8502b065a390d1bcfbd241b4eca203", + "h1:2F0vd/rIHLneWwutH0Y7gSZh3dP+YxRMWn4mj6VVQP4=", + "h1:BsyuVYH+grE2o7G8U8CcqY25H8xFTTI17J7JEa0sX3U=", + "h1:FbznG2p+5b90nFIQxlFg1601ZvcfoR+V9WDFF7abhdo=", + "h1:OHAQ6pJRvU5wlZlIhtCgsTAYuptaSuo7tXRPK92DTbk=", + "h1:Ocp+tHOYR4bwBhcCnPxs0gqD3gnyeSO4WpetC+r9pk0=", + "h1:R0H+QVyd2PDcR51vTMPnT60z6Vc2Xgp/EDeAQrsr5Ls=", + "h1:R5b5IUC/PC1AQ6ezME1HnnY0JduS19IlQb3g4T9I0fM=", + "h1:W+TpPd42FX04gHR64yupT1SkgHepDXQ6GRg+A9NKtlc=", + "h1:YoOBDt9gdoivbUh1iGoZNqRBUdBO+PBAxpSZFeTLLYE=", + "h1:Z3G9/bESudmrRsgGrLYQbVfNOQcSYGO3uqTtMBeIxhY=", + "h1:dPt22B7PN6YiG7xPCCrn5tx6oizvhM+Fbi9PZFPu4v0=", + "h1:ii5GApTUhnY2GzPaarsR689gAumo3yc+axaKQXHLymQ=", + "h1:pnGQV5uq2XguQJ3TWLL2jHinuV4fPtkTWN0vE/PznOI=", + "h1:taCFu32qaYBCMTyl/HRjGexPjPJ/nfNCUVp+78qTTK8=", + "zh:05534adf6f02d6ec26dbeb37a4d2b6edb63f12dc9ab5cc05ab89329fcd793194", + "zh:1d224056866abc4c8f893d55bc6493b73688126fbeaf017ecfbcf5d2f16649c4", + "zh:486d28a0a4af2ea23964a8e9087d66e8d794e3438976633b8554684a9237499d", + "zh:4bc17c2e93034099b64eb94eaea31b48888b6abdf170e26cf0f6ea734926084c", + "zh:5c48c8e82fa8c410499eaa5980c0ebcf6a42360742dfd695393eb9b0bffd4232", + "zh:60c387caa94d67e0b768f5874abbd103638c4c9b14073b6cd121018efdfc77bc", + "zh:72ddd5e5e07aac1c1c54659df238e6490aac3abbd2e4f13ccf7a9d877c2e2d0f", + "zh:8b03d7c4e23a51c9d323f24784d6bfd044f03e6e512df8d458abc97c943a3d3e", + "zh:93b6a3c3299fc67d349f8ab80a9b6b65e0e9f3a7e7ea3da0cd87e3ca3b48137b", + "zh:9982fc3885797ee97aa45ac7eba0fe6870220748bfa3091141ff513dd7583809", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29", - "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87", - "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b", - "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041", - "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358", + "zh:b7d60f8527dbffe11c83a05b63459d18fda921616242246a73cf3044b8732bcf", + "zh:be7a57524298df3c377cdd676e691500277a423ac50f7b33dd02b7d6f4e924fd", + "zh:c6ae0b1510804c705aab99659f228bdbafa663fa72ace50c811c0b9220c7dafb", + "zh:cdf524a269b4aeb5b1f081d91f54bae967ad50d9c392073a0db1602166a48dff", ] } diff --git a/terraform/environment/lambda.tf b/terraform/environment/lambda.tf index 70a2a40d..6ab6fafa 100644 --- a/terraform/environment/lambda.tf +++ b/terraform/environment/lambda.tf @@ -7,7 +7,7 @@ data "aws_kms_key" "secrets_manager" { } module "lambda_lpa_v1" { - source = "github.com/terraform-aws-modules/terraform-aws-lambda.git?ref=v7.4.0" + source = "github.com/terraform-aws-modules/terraform-aws-lambda.git?ref=v7.17.0" function_name = "lpa-${local.environment}-v1" handler = "app.lpa.lambda_handler" diff --git a/terraform/environment/versions.tf b/terraform/environment/versions.tf index 2cab0b4f..ed8478cd 100644 --- a/terraform/environment/versions.tf +++ b/terraform/environment/versions.tf @@ -5,5 +5,5 @@ terraform { version = "~> 5.0" } } - required_version = "1.9.7" + required_version = "1.10.2" } \ No newline at end of file