Skip to content

Commit

Permalink
Merge pull request #1674 from ministryofjustice/renovate-all-minor-pa…
Browse files Browse the repository at this point in the history
…tch-updates

Renovate Update Patch & Minor Updates
  • Loading branch information
hawx authored Dec 9, 2024
2 parents a7ff639 + f7387a4 commit 84437c4
Show file tree
Hide file tree
Showing 37 changed files with 202 additions and 140 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/analysis-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/[email protected].5
uses: github/codeql-action/[email protected].6
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -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/[email protected].5
uses: github/codeql-action/[email protected].6

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected].5
uses: github/codeql-action/[email protected].6
2 changes: 1 addition & 1 deletion .github/workflows/analysis-tfsec-to-github-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
with:
sarif_file: tfsec.sarif
- name: Upload SARIF file
uses: github/codeql-action/[email protected].5
uses: github/codeql-action/[email protected].6
with:
sarif_file: tfsec.sarif
2 changes: 1 addition & 1 deletion .github/workflows/docker_job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:

- name: Upload Trivy scan results to GitHub Security tab for ${{ matrix.ecr_repository }}
id: trivy_upload_sarif
uses: github/codeql-action/[email protected].5
uses: github/codeql-action/[email protected].6
if: always()
with:
sarif_file: 'trivy-results.sarif'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
--broker-password ${{ secrets.pact_broker_password }}
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5.0.7
uses: codecov/codecov-action@v5.1.1
with:
flags: unittests
files: ./coverage.out
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 22.11.0
nodejs 22.12.0
2 changes: 1 addition & 1 deletion docker/localstack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -o cmd/schedule
&& chmod 755 cmd/scheduled-task-adder/bootstrap \
&& zip -r -j scheduled-task-adder.zip cmd/scheduled-task-adder/bootstrap

FROM --platform=${TARGETARCH} localstack/localstack:4.0.2 AS localstack
FROM --platform=${TARGETARCH} localstack/localstack:4.0.3 AS localstack

COPY --from=build /app/event-received.zip /etc/event-received.zip
COPY --from=build /app/schedule-runner.zip /etc/schedule-runner.zip
Expand Down
2 changes: 1 addition & 1 deletion docker/mlpa/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.23.3-alpine AS base

WORKDIR /app

FROM node:22.11.0-alpine3.20 AS asset-env
FROM node:22.12.0-alpine3.20 AS asset-env

WORKDIR /app

Expand Down
64 changes: 32 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ require (
github.com/MicahParks/jwkset v0.5.20
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.5
github.com/aws/aws-sdk-go-v2/config v1.28.5
github.com/aws/aws-sdk-go-v2/credentials v1.17.46
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.17
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.1
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.37.1
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.35.6
github.com/aws/aws-sdk-go-v2/service/s3 v1.69.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.50.1
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.6
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.0
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.28.6
github.com/aws/aws-sdk-go-v2/credentials v1.17.47
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.20
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.43.3
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.0
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.36.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.52.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.7
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.2
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.1
github.com/aws/smithy-go v1.22.1
github.com/dustin/go-humanize v1.0.1
github.com/felixge/httpsnoop v1.0.4
Expand All @@ -27,12 +27,12 @@ require (
github.com/gorilla/handlers v1.5.2
github.com/gorilla/securecookie v1.1.2
github.com/gorilla/sessions v1.4.0
github.com/ministryofjustice/opg-go-common v1.38.0
github.com/ministryofjustice/opg-go-common v1.41.0
github.com/mitchellh/hashstructure/v2 v2.0.2
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.10.0
github.com/vektra/mockery/v2 v2.49.1
github.com/vektra/mockery/v2 v2.50.0
github.com/xeipuuv/gojsonschema v1.2.0
go.opentelemetry.io/contrib/detectors/aws/ecs v1.32.0
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda v0.57.0
Expand All @@ -46,25 +46,25 @@ require (
go.opentelemetry.io/otel/trace v1.32.0
golang.org/x/mod v0.22.0
golang.org/x/time v0.8.0
golang.org/x/tools v0.27.0
golang.org/x/tools v0.28.0
)

require (
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.6 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.8 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20221221133751-67e37ae746cd // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/chigopher/pathlib v0.19.1 // indirect
Expand Down Expand Up @@ -107,11 +107,11 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.68.0 // indirect
Expand Down
Loading

0 comments on commit 84437c4

Please sign in to comment.