From 733b42d5e0281866b37891bab858150f6dda09b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 23:03:27 +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..73a6fea0 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.9 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.9 # ℹī¸ 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.9 \ 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..75de9af2 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.9 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..61acd2e7 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.83 +jsonschema==4.23.0 +fakeredis==2.26.2 +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..0fa5c39b 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.2 +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.23 +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..818eae4a 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.82.1" 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:0QSRiKhUqEq5bvfUMLKK6uaqZkztjof6N5qtI0gKlZY=", + "h1:64o1tYE5ORCQ5+SwPjeDFizVWtHMchY8y75Oe8Io+80=", + "h1:8bGrH6d7XrYrZvYmGncxBal6cLlBx+7SyeJOSlhrqTQ=", + "h1:AbpiGBwi+si2gVajSM1/axT3HG2CMNSMvmCaa3xa4ZY=", + "h1:DCOAte4lvqxS2zJoYyhnGfFtbmrNSXIELXNMbmz516g=", + "h1:DQTz/n43MKV+Z44l2yToVT0ZBYamPF77lXZrwFq3Pps=", + "h1:JAXZtXTCMwqmuJYKNN/lBVOyQUT+na9OLt60u47TTOY=", + "h1:QTOtDMehUfiD3wDbbDuXYuTqGgLDkKK9Agkd5NCUEic=", + "h1:T5e7GRR3G62pbZAhPBX6kOHWR90PjrtHqCGzHbFXGFg=", + "h1:bQ2VqgtPJqW4d84oTgTQWsQTK9phwP1r2pFfKA7BS4k=", + "h1:lcgo0+UxSD+buZetjhVx3P6pL1H/W2JYNQH4qfDJWUw=", + "h1:miXCPasN7jF0qC3fIqhv9N/I6g2RZ84tUaAHi/i810A=", + "h1:sAvzUq+/x7R216EcQgPInAUa/QAeA/oUE0VZeVinGZQ=", + "h1:zaChxB0Rt0EX7NdqsJbHhHI07NymLom3awZWwKJm8R0=", + "zh:0fde8533282973f1f5d33b2c4f82d962a2c78860d39b42ac20a9ce399f06f62c", + "zh:1fd1a252bffe91668f35be8eac4e0a980f022120254eae1674c3c05049aff88a", + "zh:31bbd380cd7d74bf9a8c961fc64da4222bed40ffbdb27b011e637fa8b2d33641", + "zh:333ee400cf6f62fa199dc1270bf8efac6ffe56659f86918070b8351b8636e03b", + "zh:42ea9fee0a152d344d548eab43583299a13bcd73fae9e53e7e1a708720ac1315", + "zh:4b78f25a8cda3316eb56aa01909a403ec2f325a2eb0512c9a73966068c26cf29", + "zh:5e9cf9a275eda8f7940a41e32abe0b92ba76b5744def4af5124b343b5f33eb94", + "zh:6a46c8630c16b9e1338c2daed6006118db951420108b58b8b886403c69317439", + "zh:6efe11cf1a01f98a8d8043cdcd8c0ee5fe93a0e582c2b69ebb73ea073f5068c3", + "zh:88ab5c768c7d8133dab94eff48071e764424ad2b7cfeee5abe6d5bb16e4b85c6", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29", - "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87", - "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b", - "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041", - "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358", + "zh:a614beb312574342b27dbc34d65b450997f63fa3e948d0d30f441e4f69337380", + "zh:c1f486e27130610a9b64cacb0bd928009c433d62b3be515488185e6467b4aa1f", + "zh:dccd166e89e1a02e7ce658df3c42d040edec4b09c6f7906aa5743938518148b1", + "zh:e75a3ae0fb42b7ea5a0bb5dffd8f8468004c9700fcc934eb04c264fda2ba9984", ] } 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