From 92ed693f36dd1944d3475761faebc974b9746560 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 01:39:39 +0000 Subject: [PATCH 1/4] Renovate Update Patch & Minor Updates --- .github/workflows/analysis-codeql.yml | 6 +- .../analysis-tfsec-to-github-security.yml | 2 +- .github/workflows/docker_job.yml | 8 +- docker/mock-pay/Dockerfile | 2 +- docker/schedule-runner/Dockerfile | 2 +- go.mod | 38 ++++---- go.sum | 37 ++++++++ .../src/requirements.txt | 2 +- package.json | 2 +- terraform/account/.terraform.lock.hcl | 91 ++++++++++++------- .../modules/aws_backup_vault/versions.tf | 2 +- terraform/account/modules/kms_key/versions.tf | 6 +- .../modules/antivirus_definitions/versions.tf | 2 +- .../region/modules/dns_firewall/versions.tf | 2 +- .../dynamodb_exports_s3_bucket/versions.tf | 2 +- .../modules/s3_batch_manifests/versions.tf | 2 +- .../s3_bucket_event_notifications/versions.tf | 2 +- terraform/account/region/versions.tf | 2 +- terraform/account/versions.tf | 6 +- terraform/environment/.terraform.lock.hcl | 91 ++++++++++++------- terraform/environment/global/versions.tf | 4 +- .../region/modules/app/versions.tf | 2 +- .../modules/application_logs/versions.tf | 2 +- .../modules/ecs_autoscaling/versions.tf | 2 +- .../region/modules/event_bus/versions.tf | 2 +- .../region/modules/event_received/versions.tf | 2 +- .../versions.tf | 2 +- .../region/modules/lambda/version.tf | 2 +- .../region/modules/mock_onelogin/versions.tf | 2 +- .../region/modules/mock_pay/versions.tf | 2 +- .../region/modules/s3_antivirus/versions.tf | 2 +- .../modules/schedule_runner/versions.tf | 2 +- .../modules/uploads_s3_bucket/versions.tf | 2 +- terraform/environment/region/versions.tf | 4 +- terraform/environment/versions.tf | 6 +- yarn.lock | 20 ++-- 36 files changed, 226 insertions(+), 139 deletions(-) diff --git a/.github/workflows/analysis-codeql.yml b/.github/workflows/analysis-codeql.yml index cde394953a..12b34065ed 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.26.12 + uses: github/codeql-action/init@v3.26.13 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.26.12 + uses: github/codeql-action/autobuild@v3.26.13 # ℹī¸ 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.26.12 + uses: github/codeql-action/analyze@v3.26.13 diff --git a/.github/workflows/analysis-tfsec-to-github-security.yml b/.github/workflows/analysis-tfsec-to-github-security.yml index 5725ab9e8f..aec61f6c81 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.26.12 + uses: github/codeql-action/upload-sarif@v3.26.13 with: sarif_file: tfsec.sarif diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml index d479ba7d42..419e557c58 100644 --- a/.github/workflows/docker_job.yml +++ b/.github/workflows/docker_job.yml @@ -99,7 +99,7 @@ jobs: - name: Trivy Dockerfile Configuration Scanner for ${{ matrix.ecr_repository }} id: trivy_dockerfile_misconfiguration_scan - uses: aquasecurity/trivy-action@0.26.0 + uses: aquasecurity/trivy-action@0.28.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-java-db:1 @@ -130,7 +130,7 @@ jobs: - name: Trivy Image Vulnerability Scanner for ${{ matrix.ecr_repository }} id: trivy_scan - uses: aquasecurity/trivy-action@0.26.0 + uses: aquasecurity/trivy-action@0.28.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-java-db:1 @@ -143,13 +143,13 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab for ${{ matrix.ecr_repository }} id: trivy_upload_sarif - uses: github/codeql-action/upload-sarif@v3.26.12 + uses: github/codeql-action/upload-sarif@v3.26.13 if: always() with: sarif_file: 'trivy-results.sarif' - name: Trivy Image SBOM Generator for ${{ matrix.ecr_repository }} and submit results to Dependency Graph id: trivy_sbom - uses: aquasecurity/trivy-action@0.26.0 + uses: aquasecurity/trivy-action@0.28.0 env: TRIVY_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-db:2 TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-java-db:1 diff --git a/docker/mock-pay/Dockerfile b/docker/mock-pay/Dockerfile index daef3782ad..fdf9584c3d 100644 --- a/docker/mock-pay/Dockerfile +++ b/docker/mock-pay/Dockerfile @@ -1,4 +1,4 @@ -FROM outofcoffee/imposter:4.0.5 +FROM outofcoffee/imposter:4.1.2 COPY ./docker/mock-pay /opt/imposter/config/ diff --git a/docker/schedule-runner/Dockerfile b/docker/schedule-runner/Dockerfile index 8b5f076928..40da86450e 100644 --- a/docker/schedule-runner/Dockerfile +++ b/docker/schedule-runner/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1-alpine AS build +FROM golang:1.23.2-alpine AS build WORKDIR /app diff --git a/go.mod b/go.mod index a8699076f7..fa580683a2 100644 --- a/go.mod +++ b/go.mod @@ -7,37 +7,37 @@ require ( github.com/MicahParks/keyfunc/v3 v3.3.5 github.com/aws/aws-lambda-go v1.47.0 github.com/aws/aws-sdk-go-v2 v1.32.2 - github.com/aws/aws-sdk-go-v2/config v1.27.43 + github.com/aws/aws-sdk-go-v2/config v1.28.0 github.com/aws/aws-sdk-go-v2/credentials v1.17.41 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.12 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.35.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.66.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2 github.com/aws/smithy-go v1.22.0 github.com/dustin/go-humanize v1.0.1 github.com/felixge/httpsnoop v1.0.4 - github.com/gabriel-vasile/mimetype v1.4.5 + github.com/gabriel-vasile/mimetype v1.4.6 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/google/uuid v1.6.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/sessions v1.4.0 - github.com/ministryofjustice/opg-go-common v1.18.0 + github.com/ministryofjustice/opg-go-common v1.25.0 github.com/mitchellh/hashstructure/v2 v2.0.2 - github.com/opensearch-project/opensearch-go/v4 v4.2.0 + github.com/opensearch-project/opensearch-go/v4 v4.3.0 github.com/pact-foundation/pact-go/v2 v2.0.8 github.com/stretchr/testify v1.9.0 - github.com/vektra/mockery/v2 v2.46.2 + github.com/vektra/mockery/v2 v2.46.3 github.com/xeipuuv/gojsonschema v1.2.0 - go.opentelemetry.io/contrib/detectors/aws/ecs v1.30.0 - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 - go.opentelemetry.io/contrib/propagators/aws v1.30.0 - go.opentelemetry.io/otel v1.30.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 - go.opentelemetry.io/otel/sdk v1.30.0 - go.opentelemetry.io/otel/trace v1.30.0 + go.opentelemetry.io/contrib/detectors/aws/ecs v1.31.0 + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 + go.opentelemetry.io/contrib/propagators/aws v1.31.0 + go.opentelemetry.io/otel v1.31.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 + go.opentelemetry.io/otel/sdk v1.31.0 + go.opentelemetry.io/otel/trace v1.31.0 golang.org/x/mod v0.21.0 golang.org/x/time v0.7.0 golang.org/x/tools v0.26.0 @@ -96,8 +96,8 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect - go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect + go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect @@ -107,10 +107,10 @@ require ( golang.org/x/sys v0.26.0 // indirect golang.org/x/term v0.25.0 // indirect golang.org/x/text v0.19.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect google.golang.org/grpc v1.67.1 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 6079e1190f..195c48452d 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6 h1:pT3hpW0cOHRJx8Y0 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.6/go.mod h1:j/I2++U0xX+cr44QjHay4Cvxj6FUbnxrgmqN3H1jTZA= github.com/aws/aws-sdk-go-v2/config v1.27.43 h1:p33fDDihFC390dhhuv8nOmX419wjOSDQRb+USt20RrU= github.com/aws/aws-sdk-go-v2/config v1.27.43/go.mod h1:pYhbtvg1siOOg8h5an77rXle9tVG8T+BWLWAo7cOukc= +github.com/aws/aws-sdk-go-v2/config v1.28.0 h1:FosVYWcqEtWNxHn8gB/Vs6jOlNwSoyOCA/g/sxyySOQ= +github.com/aws/aws-sdk-go-v2/config v1.28.0/go.mod h1:pYhbtvg1siOOg8h5an77rXle9tVG8T+BWLWAo7cOukc= github.com/aws/aws-sdk-go-v2/credentials v1.17.41 h1:7gXo+Axmp+R4Z+AK8YFQO0ZV3L0gizGINCOWxSLY9W8= github.com/aws/aws-sdk-go-v2/credentials v1.17.41/go.mod h1:u4Eb8d3394YLubphT4jLEwN1rLNq2wFOlT6OuxFwPzU= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.12 h1:zYf8E8zaqolHA5nQ+VmX2r3wc4K6xw5i6xKvvMjZBL0= @@ -42,6 +44,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2 h1:t7iUP9+4wdc5lt github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.2/go.mod h1:/niFCtmuQNxqx9v8WAPq5qh7EH25U4BF6tjoyq9bObM= github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2 h1:yi8m+jepdp6foK14xXLGkYBenxnlcfJ45ka4Pg7fDSQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.65.2/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= +github.com/aws/aws-sdk-go-v2/service/s3 v1.66.0 h1:xA6XhTF7PE89BCNHJbQi8VvPzcgMtmGC5dr8S8N7lHk= +github.com/aws/aws-sdk-go-v2/service/s3 v1.66.0/go.mod h1:cB6oAuus7YXRZhWCc1wIwPywwZ1XwweNp2TVAEGYeB8= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2 h1:Rrqru2wYkKQCS2IM5/JrgKUQIoNTqA6y/iuxkjzxC6M= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2/go.mod h1:QuCURO98Sqee2AXmqDNxKXYFm2OEDAVAPApMqO0Vqnc= github.com/aws/aws-sdk-go-v2/service/sqs v1.36.2 h1:kmbcoWgbzfh5a6rvfjOnfHSGEqD13qu1GfTPRZqg0FI= @@ -76,6 +80,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= +github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -131,6 +137,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/ministryofjustice/opg-go-common v1.18.0 h1:mgU2n3TpF8E7R5TXGQeQ/U2/+EfyU+rCMrdGkzf36x8= github.com/ministryofjustice/opg-go-common v1.18.0/go.mod h1:mtyOXWagT8HzXEJXMMH8WcL1bWUkBdpSBgebDskjM0c= +github.com/ministryofjustice/opg-go-common v1.25.0 h1:3IStVH4h5GP4rcNP0EgAe1G/ZIsXngYIIl0Yi4X4cqM= +github.com/ministryofjustice/opg-go-common v1.25.0/go.mod h1:Ty1VoKA8xg8TnKRoeiV9a6ywbrvdd1GNMlXcckfdHms= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= @@ -139,6 +147,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/opensearch-project/opensearch-go/v4 v4.2.0 h1:uaBexfVdeSU15yOUPYF+IY059koVP0oNQPyoSde6N/A= github.com/opensearch-project/opensearch-go/v4 v4.2.0/go.mod h1:9v6a0OHRIeHwLPQlHOia18bw6R5XKECoXy93TWjX/10= +github.com/opensearch-project/opensearch-go/v4 v4.3.0 h1:gmQ+ILFJW6AJimivf+lHGVqCS2SCr/PBBf2Qr1xOCgE= +github.com/opensearch-project/opensearch-go/v4 v4.3.0/go.mod h1:+w6KAvEX3S0fVVmZciNLN0CkXhxxem26+F6Y7DoPp04= github.com/pact-foundation/pact-go/v2 v2.0.8 h1:j9s/tk46O5hpEEbYd0/QF9kQlQt/mu3HJrVJVeix54w= github.com/pact-foundation/pact-go/v2 v2.0.8/go.mod h1:/IAP9loNwPHWdZUrECAltM8p630NETHitNarJa/DkXU= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= @@ -192,6 +202,7 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/vektra/mockery/v2 v2.46.2 h1:bpUncWvkiDzqn+aWwt4dY1aS0F8Ob4k8+WJrWU/Kh4s= github.com/vektra/mockery/v2 v2.46.2/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ= +github.com/vektra/mockery/v2 v2.46.3/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ= github.com/wI2L/jsondiff v0.6.0 h1:zrsH3FbfVa3JO9llxrcDy/XLkYPLgoMX6Mz3T2PP2AI= github.com/wI2L/jsondiff v0.6.0/go.mod h1:D6aQ5gKgPF9g17j+E9N7aasmU1O+XvfmWm1y8UMmNpw= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= @@ -202,24 +213,44 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= go.opentelemetry.io/contrib/detectors/aws/ecs v1.30.0 h1:tyAMwh9XYbINOpW62iYo2k7ZlPgjEulbEFudzlY8H1I= go.opentelemetry.io/contrib/detectors/aws/ecs v1.30.0/go.mod h1:NuMawOvkflSsTZAu3iF3ydeF4spFQUnf8DYjK8YdqYI= +go.opentelemetry.io/contrib/detectors/aws/ecs v1.31.0 h1:9NnVhmpyOhAoqUow2eQADRxU5RXPamxEapA14ZerbiY= +go.opentelemetry.io/contrib/detectors/aws/ecs v1.31.0/go.mod h1:mt4gForBfLxbUC/ELOFpKVn5+8sxklaJmMBLTH+di3w= go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0 h1:MnAevUB0SFfKALzF5ApgrArdvHZduRT3/e59L/lNYKE= go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.55.0/go.mod h1:MHPbT1EvQOZMGbKeuCovYWcyM9iaxcltRf7+GsU8ziE= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0 h1:bPOyEYm7Lz4W+Koclh4uMeA025PgGvG1lwQeSOrAcJc= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.56.0/go.mod h1:iRRO4kpgl2O3XyMKKaA/Egix+DFHWp6m25SVEJyLb64= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM= go.opentelemetry.io/contrib/propagators/aws v1.30.0 h1:zgdTJFAOV7Hz8Qj2WyFn9dcKY5lGzzbzjZwVyb3hLpQ= go.opentelemetry.io/contrib/propagators/aws v1.30.0/go.mod h1:91m2Z4jJlILKAJmqRD/AeNiJrTNquB0m/o6dV15WMiI= +go.opentelemetry.io/contrib/propagators/aws v1.31.0 h1:OJHDboLd4zH1j0UrxoQbSDPEykmBJ/epVa/v+fRCRi0= +go.opentelemetry.io/contrib/propagators/aws v1.31.0/go.mod h1:mtT7x7gY+jL4fH34l8dkZeo6Jvf+3Fy002rjuEdRnTM= go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts= go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0/go.mod h1:KQsVNh4OjgjTG0G6EiNi1jVpnaeeKsKMRwbLN+f1+8M= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 h1:K0XaT3DwHAcV4nKLzcQvwAgSyisUghWoY20I7huthMk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0/go.mod h1:B5Ki776z/MBnVha1Nzwp5arlzBbE3+1jk+pGmaP5HME= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 h1:m0yTiGDLUvVYaTFbAvCkVYIYcvwKt3G7OLoN77NUs/8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0/go.mod h1:wBQbT4UekBfegL2nx0Xk1vBcnzyBPsIVm9hRG4fYcr4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 h1:FFeLy03iVTXP6ffeN2iXrxfGsZGCjVx0/4KlizjyBwU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0/go.mod h1:TMu73/k1CP8nBUpDLc71Wj/Kf7ZS9FK5b53VapRsP9o= go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w= go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= go.opentelemetry.io/otel/sdk v1.30.0 h1:cHdik6irO49R5IysVhdn8oaiR9m8XluDaJAs4DfOrYE= go.opentelemetry.io/otel/sdk v1.30.0/go.mod h1:p14X4Ok8S+sygzblytT1nqG98QG2KYKv++HE0LY/mhg= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc= go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -252,12 +283,18 @@ golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= +google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 h1:T6rh4haD3GVYsgEfWExoCZA2o2FmbNyKpTuAxbEFPTg= +google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:wp2WsuBYj6j8wUdo3ToZsdxxixbvQNAHqVJrTgi5E5M= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/lambda/create_s3_replication_job/src/requirements.txt b/lambda/create_s3_replication_job/src/requirements.txt index 9201433d12..dcbd50cb68 100644 --- a/lambda/create_s3_replication_job/src/requirements.txt +++ b/lambda/create_s3_replication_job/src/requirements.txt @@ -1,4 +1,4 @@ requests==2.32.3 -boto3==1.35.38 +boto3==1.35.43 aws-xray-sdk==2.14.0 awslambdaric==2.2.1 diff --git a/package.json b/package.json index 0749c12eae..468cb96756 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@ministryofjustice/frontend": "2.2.4", "aws-rum-web": "^1.11.0", "esbuild": "^0.24.0", - "govuk-frontend": "5.7.0", + "govuk-frontend": "5.7.1", "jquery": "^3.6.1", "sass": "^1.56.1", "totp-generator": "^1.0.0" diff --git a/terraform/account/.terraform.lock.hcl b/terraform/account/.terraform.lock.hcl index f7b75af023..64ef9d7ff2 100644 --- a/terraform/account/.terraform.lock.hcl +++ b/terraform/account/.terraform.lock.hcl @@ -2,45 +2,70 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.70.0" - constraints = ">= 5.5.0, ~> 5.70.0" + version = "5.72.1" + constraints = ">= 5.5.0, ~> 5.72.0" hashes = [ - "h1:kcKscQCmMLrNMAkaL4XIqGGq4uk8vXthNRvtfersNH0=", - "zh:09cbec93c324e6f03a866244ecb2bae71fdf1f5d3d981e858b745c90606b6b6d", - "zh:19685d9f4c9ddcfa476a9a428c6c612be4a1b4e8e1198fbcbb76436b735284ee", - "zh:3358ee6a2b24c982b7c83fac0af6898644d1bbdabf9c4e0589e91e427641ba88", - "zh:34f9f2936de7384f8ed887abdbcb54aea1ce7b0cf2e85243a3fd3904d024747f", - "zh:4a99546cc2140304c90d9ccb9db01589d4145863605a0fcd90027a643ea3ec5d", - "zh:4da32fec0e10dab5aa3dea3c9fe57adc973cc73a71f5d59da3f65d85d925dc3f", - "zh:659cf94522bc38ce0af70f7b0371b2941a0e0bcad02d17c1a7b264575fe07224", - "zh:6f1c172c9b98bc86e4f0526872098ee3246c2620f7b323ce0c2ce6427987f7d2", - "zh:79bf8fb8f37c308742e287694a9de081ff8502b065a390d1bcfbd241b4eca203", + "h1:4cmVqJEOmUDwe+8SePQpQ+WKh+dCNKq+K/k8gPMlVTw=", + "h1:BkYfMmqLJIqLkLLz9sDRWJR5+7GCXTocNPN4pIHkhQo=", + "h1:HF4YeF+Pn/8vYeGIAsCRby7524wJsqbFUEWdkfPVAzU=", + "h1:KYsFDxHdEVp0b/OSMWTIpk4cDK/S5p7297b4n3M3WMY=", + "h1:QXz1aAXcvnhljfQ75KRHE2lvXOOKaT4i5OUvaO8HV4U=", + "h1:ZSJLLwInUKiZ1fHNduFkIXJDXbLy5t4wZ6hFH1Lz1fE=", + "h1:ZpM0d+tK1vhOi6llGqex5PgzdlOURa543XU9uYvjA2E=", + "h1:iN9nK7Ju+BrrPEi+mAkjQj37ZFaLcm3ab6uql/ThuAI=", + "h1:jhd5O5o0CfZCNEwwN0EiDAzb7ApuFrtxJqa6HXW4EKE=", + "h1:pJScjWs7Q7w4D7a1njB/E0bVm5U0rZoxr9iX3bzk7C8=", + "h1:rg7Ddyzvcy2qnJeClPpB3f8Kv9qcJDOYPUiQmsB8s/U=", + "h1:vxyASKtB4cH3WR1Rcd8n93hO1Ge++3I/Iuc1MMWceKI=", + "h1:w9BBhHi2p/AOJfk1V276EyhanwLhmD5icGuXdGS7LRo=", + "h1:wv1usSZjYKQ7Jm5+fGHWBgPDeQpMgRHtZ7eLwpMr34Q=", + "zh:0dea6843836e926d33469b48b948744079023816d16a2ff7666bcfb6aa3522d4", + "zh:195fa9513f75800a0d62797ebec75ee73e9b8c28d713fe9b63d3b1d1eec129b3", + "zh:1ed92f3961715bf0e024bcde3c12dfbdc50b00c1f8a43cc00802cfc45a256208", + "zh:2ac687e3a52606466cae4a6813e81d923042488df88d2424e28d3f8530f091bb", + "zh:32e7ca75f9314557daada3c44628fe1f3bf964a4f833bfb4b2295d833fe64b6f", + "zh:374ee0e6b4327cc6ef666908ce5d6450a3a56e90cd2b785e83c2bcfc100021d2", + "zh:5500fd6fdac44f96411fcf9c6d01691159ec35455ed127eb4c3a498e1cc92a64", + "zh:723a2dc4b064c12e7ee62ad4fbfd72fa5e025206ea47b735994ef53f3c373152", + "zh:89d97b87605f1d734f27e642567cbecf785b521af8ea81dac55c77ccde876221", + "zh:951ee1e5731e8d65d521d71b95927e55055b3c4656eef6d46fa580a63328befc", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29", - "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87", - "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b", - "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041", - "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358", + "zh:9b2b362470b64ec227b2da64762ab8bc4111c6b80365fd9d82fc5e1e33f44038", + "zh:aa6e57d0cb974ff0da5dee5d43ad2745cbbc4a2b507d4c799839b9fa96daf688", + "zh:ba0d14c4a6b7aa844a830d47c0bf995b632e37f0795394b5b60c638b62b7fc03", + "zh:c9764065a9c5d324db0b02bd201b9e3a2118e49c4960884acdeea377173302e9", ] } provider "registry.terraform.io/pagerduty/pagerduty" { - version = "3.15.7" - constraints = "3.15.7" + version = "3.16.0" + constraints = "3.16.0" hashes = [ - "h1:RhoHaWIBTWKlNRPHUitTt39tQAHr3b6wVG05/ekF9V0=", - "zh:0259a8d783a5f16de5ca8d8f78b650e01f8791a8be20788ad6d57282f2cf0f75", - "zh:05ddf54cff81573694769b782c1d1367c6df3278e6f49264d04ca342a6074969", - "zh:1c87279e794ec716f377b67b48d0d0797c259ad293ea9cd8ad78ba345e8f1cde", - "zh:21c0c21f4c3c894c106a00bd3bd80c55081853d833b33035275be54672652b15", - "zh:559d47a774086b9bd6abb4df1b928e95b8dd513230bbe73091f48ce12e46a9b4", - "zh:614e1fa0d04e5a3821b7a55846b90fbd08654416f2f6f158d32de442a1a9cc92", - "zh:791cdc88949c64e61dcea39000b0a5a56cafcac011b7cb19c2295436b958e356", - "zh:85c8c5ac42a2da1860ad7818c2c074c4d3f693e3837b9c244b9b4a6eeaf9fec1", - "zh:990c59b7c5e78ecff1b0930db1c53287d08ac8e4310078e9f48c9c49bfdf0e2a", - "zh:b6a2a648a7560d49c1d601c1d52a1c5d199d677836c6c73b669dcec5854cf68a", - "zh:c5dbc7f939d26e13f73029670361fba0254cb569dc232cf42ec81bc395bc1f0e", - "zh:ce9b3755c290c39760bb62a0edc9395fd3d38c520b4804bd6dac78088f71514b", - "zh:db115e13ea052e699337ce7c134e25ec594c894511d60149f8ef1af01ad9684c", + "h1:3F6j7drrEOdA0wlmH1CohSCmn/2WvM0iGdJOZYgg6dw=", + "h1:6MW2qA/KRYhjce96/Ne2D/4Cum6wayuZPzds/uRmCL4=", + "h1:DxXak+5UHelkzIWXUP0Ifm83qq2nAztQLXQwPGj2I0o=", + "h1:HNhwcHDTfRm3nCV0ZwJh5jnQpRjxzgmYQKNgUnz7U+g=", + "h1:JEfCQ4AxD9sgIawTDsnQO+RRllRuLNmUQcLf1TVH7c8=", + "h1:KmeseKkFU94AHj/xLrWgs+q0UyRnsIChZw8j7sjrjEQ=", + "h1:SHfq9rB6L2+fE3JFqdNq6+1cnJnEQMxXzIC3ehQPXoY=", + "h1:VGmw0t2X9Qz3myI3pSuZEWHtKpK5iTH3tkvz1v06Wz0=", + "h1:X+pmwkdPq5VoDyxpFBS1x3HODZyG6D2x3pqu3yIxSBo=", + "h1:Xx9zIOPUHqjs6FpuCwvP2OOM6d+wKWYAmk7bjE7Mi7s=", + "h1:l5HP2pwPKlPaBd9psVvobAod03TnuQ0ilNDbKhT4ixk=", + "h1:mgq4JAcunvVbmy5ip1278CuWj+HvE0jW6iu3wNefT1o=", + "h1:yi4whJhsfVUtwQepvB33C4N7fXczgnT7Tlkn4TZY6Y8=", + "zh:035b81da7d65fc20e0a368ee68f879b8a9e9660fb5f7671ecd4e568ff17fc814", + "zh:48bace0e738e49ea9fc647f425113a12ca8bcad6d2135d06e352fc58ac03ae24", + "zh:72ee48fc4430943c7d05425074afa3f250f1ff9a2ee873af32cd0edebe09a963", + "zh:9428a0da5bea2c6f722a5b0058dd020e86134034185b8850b86e5bed4cee6a08", + "zh:97f76c81f65638fd7769133cdfea9c63f4a4347a6926ddaaa9106745f1a42daa", + "zh:a5048eeaebed96166bcf2cd06557bff48e64bfb8b39b7af1f0b156969a45ee5d", + "zh:b9e1ca3f68570272b61c8819fb9d069cc28d65e678ed5eff53ffc7408c5f5fc2", + "zh:bb3cc21f98c9151e977eb6bc55c04533e0581f2c6025cbd8a4573d7841c45c00", + "zh:d66341f4b71d8e735d1791cbb6ffdaafdac01656955336db52999c7cc80cc563", + "zh:ded8b8b3c0d7801e387528cc7bd993440fc6984a8ef3b791e2d5e1b8174f7a38", + "zh:e0beb365874d7cfaa8cbc42788ee3d3ccb7831345d3a2950ddc0370bd02a8211", + "zh:e2f001ce2391ff3eb06a2fc56ed8e1c9331ec98eabab62c91b2153aa9b643db2", + "zh:fca87d0833d041039d6e0544f7a1b0ef7477af6b2756763af528714ec4d15c1c", ] } diff --git a/terraform/account/modules/aws_backup_vault/versions.tf b/terraform/account/modules/aws_backup_vault/versions.tf index 9547695f7e..3584587585 100644 --- a/terraform/account/modules/aws_backup_vault/versions.tf +++ b/terraform/account/modules/aws_backup_vault/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.global diff --git a/terraform/account/modules/kms_key/versions.tf b/terraform/account/modules/kms_key/versions.tf index 79658821dc..1abb40b3ed 100644 --- a/terraform/account/modules/kms_key/versions.tf +++ b/terraform/account/modules/kms_key/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.eu_west_1, aws.eu_west_2, @@ -10,8 +10,8 @@ terraform { } pagerduty = { source = "PagerDuty/pagerduty" - version = "3.15.7" + version = "3.16.0" } } - required_version = "1.9.7" + required_version = "1.9.8" } diff --git a/terraform/account/region/modules/antivirus_definitions/versions.tf b/terraform/account/region/modules/antivirus_definitions/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/account/region/modules/antivirus_definitions/versions.tf +++ b/terraform/account/region/modules/antivirus_definitions/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/account/region/modules/dns_firewall/versions.tf b/terraform/account/region/modules/dns_firewall/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/account/region/modules/dns_firewall/versions.tf +++ b/terraform/account/region/modules/dns_firewall/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/account/region/modules/dynamodb_exports_s3_bucket/versions.tf b/terraform/account/region/modules/dynamodb_exports_s3_bucket/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/account/region/modules/dynamodb_exports_s3_bucket/versions.tf +++ b/terraform/account/region/modules/dynamodb_exports_s3_bucket/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/account/region/modules/s3_batch_manifests/versions.tf b/terraform/account/region/modules/s3_batch_manifests/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/account/region/modules/s3_batch_manifests/versions.tf +++ b/terraform/account/region/modules/s3_batch_manifests/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/account/region/modules/s3_bucket_event_notifications/versions.tf b/terraform/account/region/modules/s3_bucket_event_notifications/versions.tf index bd2d099fff..a68ec42258 100644 --- a/terraform/account/region/modules/s3_bucket_event_notifications/versions.tf +++ b/terraform/account/region/modules/s3_bucket_event_notifications/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" } } } diff --git a/terraform/account/region/versions.tf b/terraform/account/region/versions.tf index 883a37beb1..890ac3dfbc 100644 --- a/terraform/account/region/versions.tf +++ b/terraform/account/region/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.management, diff --git a/terraform/account/versions.tf b/terraform/account/versions.tf index 475a2efa13..84a109aae3 100644 --- a/terraform/account/versions.tf +++ b/terraform/account/versions.tf @@ -2,12 +2,12 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" } pagerduty = { source = "PagerDuty/pagerduty" - version = "3.15.7" + version = "3.16.0" } } - required_version = "1.9.7" + required_version = "1.9.8" } diff --git a/terraform/environment/.terraform.lock.hcl b/terraform/environment/.terraform.lock.hcl index 3b8deb89ac..9c5cf60f5f 100644 --- a/terraform/environment/.terraform.lock.hcl +++ b/terraform/environment/.terraform.lock.hcl @@ -2,25 +2,38 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.70.0" - constraints = "~> 5.70.0" + version = "5.72.1" + constraints = "~> 5.72.0" hashes = [ - "h1:kcKscQCmMLrNMAkaL4XIqGGq4uk8vXthNRvtfersNH0=", - "zh:09cbec93c324e6f03a866244ecb2bae71fdf1f5d3d981e858b745c90606b6b6d", - "zh:19685d9f4c9ddcfa476a9a428c6c612be4a1b4e8e1198fbcbb76436b735284ee", - "zh:3358ee6a2b24c982b7c83fac0af6898644d1bbdabf9c4e0589e91e427641ba88", - "zh:34f9f2936de7384f8ed887abdbcb54aea1ce7b0cf2e85243a3fd3904d024747f", - "zh:4a99546cc2140304c90d9ccb9db01589d4145863605a0fcd90027a643ea3ec5d", - "zh:4da32fec0e10dab5aa3dea3c9fe57adc973cc73a71f5d59da3f65d85d925dc3f", - "zh:659cf94522bc38ce0af70f7b0371b2941a0e0bcad02d17c1a7b264575fe07224", - "zh:6f1c172c9b98bc86e4f0526872098ee3246c2620f7b323ce0c2ce6427987f7d2", - "zh:79bf8fb8f37c308742e287694a9de081ff8502b065a390d1bcfbd241b4eca203", + "h1:4cmVqJEOmUDwe+8SePQpQ+WKh+dCNKq+K/k8gPMlVTw=", + "h1:BkYfMmqLJIqLkLLz9sDRWJR5+7GCXTocNPN4pIHkhQo=", + "h1:HF4YeF+Pn/8vYeGIAsCRby7524wJsqbFUEWdkfPVAzU=", + "h1:KYsFDxHdEVp0b/OSMWTIpk4cDK/S5p7297b4n3M3WMY=", + "h1:QXz1aAXcvnhljfQ75KRHE2lvXOOKaT4i5OUvaO8HV4U=", + "h1:ZSJLLwInUKiZ1fHNduFkIXJDXbLy5t4wZ6hFH1Lz1fE=", + "h1:ZpM0d+tK1vhOi6llGqex5PgzdlOURa543XU9uYvjA2E=", + "h1:iN9nK7Ju+BrrPEi+mAkjQj37ZFaLcm3ab6uql/ThuAI=", + "h1:jhd5O5o0CfZCNEwwN0EiDAzb7ApuFrtxJqa6HXW4EKE=", + "h1:pJScjWs7Q7w4D7a1njB/E0bVm5U0rZoxr9iX3bzk7C8=", + "h1:rg7Ddyzvcy2qnJeClPpB3f8Kv9qcJDOYPUiQmsB8s/U=", + "h1:vxyASKtB4cH3WR1Rcd8n93hO1Ge++3I/Iuc1MMWceKI=", + "h1:w9BBhHi2p/AOJfk1V276EyhanwLhmD5icGuXdGS7LRo=", + "h1:wv1usSZjYKQ7Jm5+fGHWBgPDeQpMgRHtZ7eLwpMr34Q=", + "zh:0dea6843836e926d33469b48b948744079023816d16a2ff7666bcfb6aa3522d4", + "zh:195fa9513f75800a0d62797ebec75ee73e9b8c28d713fe9b63d3b1d1eec129b3", + "zh:1ed92f3961715bf0e024bcde3c12dfbdc50b00c1f8a43cc00802cfc45a256208", + "zh:2ac687e3a52606466cae4a6813e81d923042488df88d2424e28d3f8530f091bb", + "zh:32e7ca75f9314557daada3c44628fe1f3bf964a4f833bfb4b2295d833fe64b6f", + "zh:374ee0e6b4327cc6ef666908ce5d6450a3a56e90cd2b785e83c2bcfc100021d2", + "zh:5500fd6fdac44f96411fcf9c6d01691159ec35455ed127eb4c3a498e1cc92a64", + "zh:723a2dc4b064c12e7ee62ad4fbfd72fa5e025206ea47b735994ef53f3c373152", + "zh:89d97b87605f1d734f27e642567cbecf785b521af8ea81dac55c77ccde876221", + "zh:951ee1e5731e8d65d521d71b95927e55055b3c4656eef6d46fa580a63328befc", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:b7a5e1dfd9e179d70a169ddd4db44b56da90309060e27d36b329fe5fb3528e29", - "zh:c2cc728cb18ffd5c4814a10c203452c71f5ab0c46d68f9aa9183183fa60afd87", - "zh:c89bb37d2b8947c9a0d62b0b86ace51542f3327970f4e56a68bf81d9d0b8b65b", - "zh:ef2a61e8112c3b5e70095508aadaadf077e904b62b9cfc22030337f773bba041", - "zh:f714550b858d141ea88579f25247bda2a5ba461337975e77daceaf0bb7a9c358", + "zh:9b2b362470b64ec227b2da64762ab8bc4111c6b80365fd9d82fc5e1e33f44038", + "zh:aa6e57d0cb974ff0da5dee5d43ad2745cbbc4a2b507d4c799839b9fa96daf688", + "zh:ba0d14c4a6b7aa844a830d47c0bf995b632e37f0795394b5b60c638b62b7fc03", + "zh:c9764065a9c5d324db0b02bd201b9e3a2118e49c4960884acdeea377173302e9", ] } @@ -44,22 +57,34 @@ provider "registry.terraform.io/hashicorp/local" { } provider "registry.terraform.io/pagerduty/pagerduty" { - version = "3.15.7" - constraints = "3.15.7" + version = "3.16.0" + constraints = "3.16.0" hashes = [ - "h1:RhoHaWIBTWKlNRPHUitTt39tQAHr3b6wVG05/ekF9V0=", - "zh:0259a8d783a5f16de5ca8d8f78b650e01f8791a8be20788ad6d57282f2cf0f75", - "zh:05ddf54cff81573694769b782c1d1367c6df3278e6f49264d04ca342a6074969", - "zh:1c87279e794ec716f377b67b48d0d0797c259ad293ea9cd8ad78ba345e8f1cde", - "zh:21c0c21f4c3c894c106a00bd3bd80c55081853d833b33035275be54672652b15", - "zh:559d47a774086b9bd6abb4df1b928e95b8dd513230bbe73091f48ce12e46a9b4", - "zh:614e1fa0d04e5a3821b7a55846b90fbd08654416f2f6f158d32de442a1a9cc92", - "zh:791cdc88949c64e61dcea39000b0a5a56cafcac011b7cb19c2295436b958e356", - "zh:85c8c5ac42a2da1860ad7818c2c074c4d3f693e3837b9c244b9b4a6eeaf9fec1", - "zh:990c59b7c5e78ecff1b0930db1c53287d08ac8e4310078e9f48c9c49bfdf0e2a", - "zh:b6a2a648a7560d49c1d601c1d52a1c5d199d677836c6c73b669dcec5854cf68a", - "zh:c5dbc7f939d26e13f73029670361fba0254cb569dc232cf42ec81bc395bc1f0e", - "zh:ce9b3755c290c39760bb62a0edc9395fd3d38c520b4804bd6dac78088f71514b", - "zh:db115e13ea052e699337ce7c134e25ec594c894511d60149f8ef1af01ad9684c", + "h1:3F6j7drrEOdA0wlmH1CohSCmn/2WvM0iGdJOZYgg6dw=", + "h1:6MW2qA/KRYhjce96/Ne2D/4Cum6wayuZPzds/uRmCL4=", + "h1:DxXak+5UHelkzIWXUP0Ifm83qq2nAztQLXQwPGj2I0o=", + "h1:HNhwcHDTfRm3nCV0ZwJh5jnQpRjxzgmYQKNgUnz7U+g=", + "h1:JEfCQ4AxD9sgIawTDsnQO+RRllRuLNmUQcLf1TVH7c8=", + "h1:KmeseKkFU94AHj/xLrWgs+q0UyRnsIChZw8j7sjrjEQ=", + "h1:SHfq9rB6L2+fE3JFqdNq6+1cnJnEQMxXzIC3ehQPXoY=", + "h1:VGmw0t2X9Qz3myI3pSuZEWHtKpK5iTH3tkvz1v06Wz0=", + "h1:X+pmwkdPq5VoDyxpFBS1x3HODZyG6D2x3pqu3yIxSBo=", + "h1:Xx9zIOPUHqjs6FpuCwvP2OOM6d+wKWYAmk7bjE7Mi7s=", + "h1:l5HP2pwPKlPaBd9psVvobAod03TnuQ0ilNDbKhT4ixk=", + "h1:mgq4JAcunvVbmy5ip1278CuWj+HvE0jW6iu3wNefT1o=", + "h1:yi4whJhsfVUtwQepvB33C4N7fXczgnT7Tlkn4TZY6Y8=", + "zh:035b81da7d65fc20e0a368ee68f879b8a9e9660fb5f7671ecd4e568ff17fc814", + "zh:48bace0e738e49ea9fc647f425113a12ca8bcad6d2135d06e352fc58ac03ae24", + "zh:72ee48fc4430943c7d05425074afa3f250f1ff9a2ee873af32cd0edebe09a963", + "zh:9428a0da5bea2c6f722a5b0058dd020e86134034185b8850b86e5bed4cee6a08", + "zh:97f76c81f65638fd7769133cdfea9c63f4a4347a6926ddaaa9106745f1a42daa", + "zh:a5048eeaebed96166bcf2cd06557bff48e64bfb8b39b7af1f0b156969a45ee5d", + "zh:b9e1ca3f68570272b61c8819fb9d069cc28d65e678ed5eff53ffc7408c5f5fc2", + "zh:bb3cc21f98c9151e977eb6bc55c04533e0581f2c6025cbd8a4573d7841c45c00", + "zh:d66341f4b71d8e735d1791cbb6ffdaafdac01656955336db52999c7cc80cc563", + "zh:ded8b8b3c0d7801e387528cc7bd993440fc6984a8ef3b791e2d5e1b8174f7a38", + "zh:e0beb365874d7cfaa8cbc42788ee3d3ccb7831345d3a2950ddc0370bd02a8211", + "zh:e2f001ce2391ff3eb06a2fc56ed8e1c9331ec98eabab62c91b2153aa9b643db2", + "zh:fca87d0833d041039d6e0544f7a1b0ef7477af6b2756763af528714ec4d15c1c", ] } diff --git a/terraform/environment/global/versions.tf b/terraform/environment/global/versions.tf index 7d3d5dd402..b32219a70c 100644 --- a/terraform/environment/global/versions.tf +++ b/terraform/environment/global/versions.tf @@ -4,14 +4,14 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.global, ] } pagerduty = { source = "PagerDuty/pagerduty" - version = "3.15.7" + version = "3.16.0" } } } diff --git a/terraform/environment/region/modules/app/versions.tf b/terraform/environment/region/modules/app/versions.tf index 41940b0e7c..82bca1f1b6 100644 --- a/terraform/environment/region/modules/app/versions.tf +++ b/terraform/environment/region/modules/app/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.management, diff --git a/terraform/environment/region/modules/application_logs/versions.tf b/terraform/environment/region/modules/application_logs/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/application_logs/versions.tf +++ b/terraform/environment/region/modules/application_logs/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/ecs_autoscaling/versions.tf b/terraform/environment/region/modules/ecs_autoscaling/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/ecs_autoscaling/versions.tf +++ b/terraform/environment/region/modules/ecs_autoscaling/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/event_bus/versions.tf b/terraform/environment/region/modules/event_bus/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/event_bus/versions.tf +++ b/terraform/environment/region/modules/event_bus/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/event_received/versions.tf b/terraform/environment/region/modules/event_received/versions.tf index 420cbae620..643e5076e0 100644 --- a/terraform/environment/region/modules/event_received/versions.tf +++ b/terraform/environment/region/modules/event_received/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.management diff --git a/terraform/environment/region/modules/fault_injection_simulator_experiments/versions.tf b/terraform/environment/region/modules/fault_injection_simulator_experiments/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/fault_injection_simulator_experiments/versions.tf +++ b/terraform/environment/region/modules/fault_injection_simulator_experiments/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/lambda/version.tf b/terraform/environment/region/modules/lambda/version.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/lambda/version.tf +++ b/terraform/environment/region/modules/lambda/version.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/mock_onelogin/versions.tf b/terraform/environment/region/modules/mock_onelogin/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/mock_onelogin/versions.tf +++ b/terraform/environment/region/modules/mock_onelogin/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/mock_pay/versions.tf b/terraform/environment/region/modules/mock_pay/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/mock_pay/versions.tf +++ b/terraform/environment/region/modules/mock_pay/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/s3_antivirus/versions.tf b/terraform/environment/region/modules/s3_antivirus/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/s3_antivirus/versions.tf +++ b/terraform/environment/region/modules/s3_antivirus/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/modules/schedule_runner/versions.tf b/terraform/environment/region/modules/schedule_runner/versions.tf index 420cbae620..643e5076e0 100644 --- a/terraform/environment/region/modules/schedule_runner/versions.tf +++ b/terraform/environment/region/modules/schedule_runner/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.management diff --git a/terraform/environment/region/modules/uploads_s3_bucket/versions.tf b/terraform/environment/region/modules/uploads_s3_bucket/versions.tf index 7393d00501..d56a9a8492 100644 --- a/terraform/environment/region/modules/uploads_s3_bucket/versions.tf +++ b/terraform/environment/region/modules/uploads_s3_bucket/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, ] diff --git a/terraform/environment/region/versions.tf b/terraform/environment/region/versions.tf index bf60352aee..989045f262 100644 --- a/terraform/environment/region/versions.tf +++ b/terraform/environment/region/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" configuration_aliases = [ aws.region, aws.global, @@ -14,7 +14,7 @@ terraform { } pagerduty = { source = "PagerDuty/pagerduty" - version = "3.15.7" + version = "3.16.0" } } } diff --git a/terraform/environment/versions.tf b/terraform/environment/versions.tf index 1a547df983..f93606c277 100644 --- a/terraform/environment/versions.tf +++ b/terraform/environment/versions.tf @@ -2,15 +2,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 5.70.0" + version = "~> 5.72.0" } pagerduty = { source = "PagerDuty/pagerduty" - version = "3.15.7" + version = "3.16.0" } local = { source = "hashicorp/local" } } - required_version = "1.9.7" + required_version = "1.9.8" } diff --git a/yarn.lock b/yarn.lock index 8738fa0bdb..bb058391a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -615,9 +615,9 @@ aws4@^1.8.0: integrity sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g== axe-core@^4.6: - version "4.10.0" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.0.tgz#d9e56ab0147278272739a000880196cdfe113b59" - integrity sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g== + version "4.10.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.1.tgz#7d2589b0183f05b0f23e55c2f4cdf97b5bdc66d9" + integrity sha512-qPC9o+kD8Tir0lzNGLeghbOrWMr3ZJpaRlCIb6Uobt/7N4FiEDvqUMnxzCHRHmg8vOg14kr5gVNyScRmbMaJ9g== balanced-match@^1.0.0: version "1.0.2" @@ -1358,10 +1358,10 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -govuk-frontend@5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.7.0.tgz#e6cd1bbb8dce25f86391b1f8d26bed95dabfbb75" - integrity sha512-kAaJbOCAJMYT30UN7rVHIWzQUvNjFq5Mw+FSIH2SM6xuCdCwyUcl+WYqxvYRqltWh6ZuAlzND0Rxr61lUoCGJA== +govuk-frontend@5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-5.7.1.tgz#d4c561ebf8c0b76130f31df8c2e4d70d340cd63f" + integrity sha512-jF1cq5rn57kxZmJRprUZhTQ31zaBBK4b5AyeJaPX3Yhg22lk90Mx/dQLvOk/ycV3wM7e0y+s4IPvb2fFaPlCGg== govuk-frontend@^5.0.0: version "5.0.0" @@ -2024,9 +2024,9 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.56.1: - version "1.79.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.5.tgz#646c627601cd5f84c64f7b1485b9292a313efae4" - integrity sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g== + version "1.80.3" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.3.tgz#3f63dd527647d2b3de35f36acb971bda80517423" + integrity sha512-ptDWyVmDMVielpz/oWy3YP3nfs7LpJTHIJZboMVs8GEC9eUmtZTZhMHlTW98wY4aEorDfjN38+Wr/XjskFWcfA== dependencies: "@parcel/watcher" "^2.4.1" chokidar "^4.0.0" From 739dd68881154473e5fc4255985572ad293bc5bb Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Mon, 21 Oct 2024 10:23:13 +0100 Subject: [PATCH 2/4] reconfigure image vuln scanner --- .github/workflows/docker_job.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml index 419e557c58..525a4edc90 100644 --- a/.github/workflows/docker_job.yml +++ b/.github/workflows/docker_job.yml @@ -136,10 +136,13 @@ jobs: TRIVY_JAVA_DB_REPOSITORY: ${{ steps.login_ecr.outputs.registry }}/trivy-db-public-ecr/aquasecurity/trivy-java-db:1 TRIVY_IGNOREFILE: ${{ matrix.trivyignores }} with: + scan-type: 'image' + scanners: 'vuln' image-ref: ${{ matrix.ecr_repository }}:${{ inputs.tag }} severity: 'HIGH,CRITICAL' format: 'sarif' output: 'trivy-results.sarif' + exit-code: 0 - name: Upload Trivy scan results to GitHub Security tab for ${{ matrix.ecr_repository }} id: trivy_upload_sarif From 5fa0d763dd05200fc5f682a6a4dd1e532bd0d91e Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Mon, 21 Oct 2024 10:53:15 +0100 Subject: [PATCH 3/4] install available openssl --- docker/mock-notify/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mock-notify/Dockerfile b/docker/mock-notify/Dockerfile index 2d98886b0d..e4e7fe0afd 100644 --- a/docker/mock-notify/Dockerfile +++ b/docker/mock-notify/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.23.2-alpine AS build-env -RUN apk --no-cache add openssl=3.3.2-r0 +RUN apk --no-cache add openssl=3.3.2-r1 WORKDIR /app From 3f700a594852a41d20803d2162c61960f41b2a4a Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Mon, 21 Oct 2024 10:55:05 +0100 Subject: [PATCH 4/4] install available openssl --- docker/mock-os-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mock-os-api/Dockerfile b/docker/mock-os-api/Dockerfile index ffbe24c77a..8cd06c0f7e 100644 --- a/docker/mock-os-api/Dockerfile +++ b/docker/mock-os-api/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.23.2-alpine AS build-env -RUN apk --no-cache add openssl=3.3.2-r0 +RUN apk --no-cache add openssl=3.3.2-r1 WORKDIR /app