From a87a2e8c1651b9d75c5b24d6b0709793e637e2ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 10:48:42 +0000 Subject: [PATCH] Renovate Update Patch & Minor Updates --- .github/workflows/analysis-codeql.yml | 6 +- .../analysis-tfsec-to-github-security.yml | 2 +- docs/support_scripts/load_testing/go.mod | 2 +- docs/support_scripts/load_testing/go.sum | 2 + docs/support_scripts/requests/go.mod | 2 +- docs/support_scripts/requests/go.sum | 2 + integration_tests/v1/requirements.txt | 16 ++--- lambda_functions/v1/Dockerfile-Function | 2 +- lambda_functions/v1/Dockerfile-tests | 2 +- .../v1/requirements/dev-requirements.txt | 22 +++---- .../v1/requirements/pact-requirements.txt | 2 +- .../v1/requirements/requirements.txt | 14 ++--- mock_sirius_backend/Dockerfile | 2 +- mock_sirius_backend/requirements.txt | 6 +- terraform/environment/.terraform.lock.hcl | 58 +++++++++---------- terraform/environment/lambda.tf | 2 +- terraform/environment/versions.tf | 2 +- 17 files changed, 74 insertions(+), 70 deletions(-) diff --git a/.github/workflows/analysis-codeql.yml b/.github/workflows/analysis-codeql.yml index 463dfe0d..6b31955a 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.6 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.6 # ℹī¸ 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.6 \ 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..d08b27c6 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.6 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..8cc5b732 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.76 +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..2a75cbe4 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.1 +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..a8ae703f 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.80.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:+ZmUvSZAOADH2pZd2i+sOxmHM2ppJf9UEuKsLraDfhk=", + "h1:/OO8jRJy2tgAO8ig1UszSFAlx5EREVquz02Aw2Tq9Hc=", + "h1:/l0pReGC777jmpqaalIptoy4REuJlaLcn0AAGY2sZGY=", + "h1:1O1XLPOrMg30ATXLC9itDvvyQUoIPIre7NiNscCOz28=", + "h1:LY5/1S56a4lEiqZd3JhT1jhHTc/6lX4sBoTqdKd4V+E=", + "h1:N5Wfsf4xe5DJfSeo0G/ulkIxzyfmUIoSj/hAiZ2DaKU=", + "h1:Qg45JNIes88ZwSZ2q3cMHE08GmBTOIOvcNSshQlG7zs=", + "h1:Tqu8BtO2hS3kwfHhZzGY5k81fUypHElyeKKBbcW1fcg=", + "h1:WP1Xv12Y3OSvbg4MbTOR23o/abqpkHpuiooXY3ng/VA=", + "h1:bydv8RElLhd/jFt+gasVZtAg6zLCFHdwcrVOLlE3XnI=", + "h1:hhgPPhwxbuD3TaJq4clfKjy31vK68UGvN87PctNMuiY=", + "h1:q2pqSs7uPWvxunrBYjyirXARlxFIoxn2Lju42uJbxk4=", + "h1:rTTtNy1jbaQOMPNHI0tA1paGZFojOnI6TNvRImj2U8s=", + "h1:zmgrhavuwxp7PkvPl61S4kNo1RzIKjIWDDgum2b16FI=", + "zh:0b1655e39639d60f2de2860a5df8642f9556ba0ca04529c1b861fde4935cb0df", + "zh:13dc0155e0a11edceee29ce687fc04c5a5a85f3324c67556472713cfd52e5807", + "zh:180f6cb2be44be14cfe329e0649121b774319f083b6e4e8fb749f85090d73121", + "zh:3158d44b74c67465f7f19f22c42b643840c8d18ce833e2ec86e8d93085b06926", + "zh:6351b5bf7cde5dc83e926944891570636069e05ca43341f4d1feda67773469bf", + "zh:6fa9db1532096ba50e842d369b6688979306d2295c7ead49b8a266b0d60962cc", + "zh:85d2fe75def7619ff2cc29102048875039cad088fafb62ecc14c3763e7b1e9d9", + "zh:9028d653f1d7341c6dfe2afe961b6541581e9043a474eac2faf90e6426a24f6d", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29", - "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87", - "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b", - "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041", - "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358", + "zh:9c4e248c442bc60f07f9f089e5361f19936833370dc3c04b27916672b765f0e1", + "zh:a710a3979596e3f3938c3ec6bb748e604724d3a4afa96ed2c14f0a245cc41a11", + "zh:c27936bdf447779d0c0833bf52a9ef618985f5ea8e3e243d6266513520ca31c4", + "zh:c7681134a123486e72eaedc3f8d2d75e267dbbfd45fa7de5aea8f757af57f89b", + "zh:ea717ebad3561fd02591f9eecf30f3df5635405556fba2bdbf29fd42691bebac", + "zh:f4e1e8f23c58c3e8f4371f9c3379a723ab4155246e6b6daad8eb99e16666b2cb", ] } diff --git a/terraform/environment/lambda.tf b/terraform/environment/lambda.tf index 70a2a40d..4ba9a016 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.16.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..19662802 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.1" } \ No newline at end of file