Renovate Update Patch & Minor Updates

ministryofjustice · Jul 7, 2023 · 3546ce1 · 3546ce1
1 parent e513f7e
commit 3546ce1
Show file tree

Hide file tree

Showing 17 changed files with 2,609 additions and 1,137 deletions.
diff --git a/.github/workflows/analysis-tfsec-pr-feedback.yml b/.github/workflows/analysis-tfsec-pr-feedback.yml
@@ -31,7 +31,7 @@ jobs:
         with:
           fetch-depth: 2
       - name: tfsec with pr comments
-        uses: tfsec/tfsec-pr-commenter-action@v1.2.0
+        uses: tfsec/tfsec-pr-commenter-action@v1.3.1
         with:
           working_directory: ${{ matrix.terraform_path }}
           github_token: ${{secrets.GITHUB_TOKEN}}

diff --git a/.github/workflows/analysis-tfsec-to-github-security.yml b/.github/workflows/analysis-tfsec-to-github-security.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@v3
       - name: Run tfsec
-        uses: tfsec/tfsec-sarif-action@v0.1.3
+        uses: tfsec/tfsec-sarif-action@v0.1.4
         with:
           sarif_file: tfsec.sarif
       - name: Upload SARIF file

diff --git a/.github/workflows/docker_job.yml b/.github/workflows/docker_job.yml
@@ -32,7 +32,7 @@ jobs:
           docker build -t maintenance-app .
       - name: Trivy Image Vulnerability Scanner
         id: trivy_scan
-        uses: aquasecurity/trivy-action@0.6.0
+        uses: aquasecurity/trivy-action@0.11.2
         with:
           image-ref: maintenance-app:latest
           severity: 'HIGH,CRITICAL'
@@ -46,7 +46,7 @@ jobs:
           sarif_file: 'trivy-results.sarif'
       - uses: unfor19/install-aws-cli-action@v1
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1.6.1
+        uses: aws-actions/configure-aws-credentials@v1.7.0
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_ACTIONS }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_ACTIONS }}
@@ -56,7 +56,7 @@ jobs:
           role-session-name: OPGMaintenanceECRGithubAction
       - name: ECR Login
         id: login_ecr
-        uses: aws-actions/amazon-ecr-login@v1.5.0
+        uses: aws-actions/amazon-ecr-login@v1.6.2
         with:
           registries: 311462405659
       - name: Push Container

diff --git a/.github/workflows/tags_job.yml b/.github/workflows/tags_job.yml
@@ -27,7 +27,7 @@ jobs:
           fi
       - name: Bump version
         id: bump_version
-        uses: anothrNick/github-tag-action@1.52.0
+        uses: anothrNick/github-tag-action@1.67.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           INITIAL_VERSION: 0.0.0

diff --git a/.github/workflows/terraform_environment_cleanup_workflow.yml b/.github/workflows/terraform_environment_cleanup_workflow.yml
@@ -45,7 +45,7 @@ jobs:
           aws-region: eu-west-1
           role-duration-seconds: 3600
           role-session-name: OPGMaintenanceTerraformGithubAction
-      - uses: webfactory/ssh-agent@v0.5.4
+      - uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_ALLOW_LIST_REPOSITORY }}
 

diff --git a/.github/workflows/terraform_environment_job.yml b/.github/workflows/terraform_environment_job.yml
@@ -51,7 +51,7 @@ jobs:
           aws-region: eu-west-1
           role-duration-seconds: 3600
           role-session-name: OPGMaintenanceTerraformGithubAction
-      - uses: webfactory/ssh-agent@v0.5.4
+      - uses: webfactory/ssh-agent@v0.8.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_ALLOW_LIST_REPOSITORY }}
 

diff --git a/service-maintenance/Dockerfile b/service-maintenance/Dockerfile
@@ -9,7 +9,7 @@ COPY package.json package-lock.json ./
 RUN npm ci && node_modules/.bin/webpack -p
 
 # Build Go app
-FROM golang:1.18-alpine as build-env
+FROM golang:1.20-alpine as build-env
 
 WORKDIR /app
 

diff --git a/service-maintenance/docker-compose.yml b/service-maintenance/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.6"
 services:
     webpack:
         container_name: maintenance-webpack
-        image: node:14.13.1-alpine3.12
+        image: node:14.18.2-alpine3.12
         working_dir: /app
         entrypoint: |
             sh -c "npm i && npm run watch"

diff --git a/service-maintenance/go.mod b/service-maintenance/go.mod
@@ -5,16 +5,19 @@ go 1.18
 require (
 	github.com/gorilla/mux v1.8.0
 	github.com/ministryofjustice/opg-go-common v0.0.0-20220308143936-cab4e8742f40
-	github.com/rs/zerolog v1.22.0
-	github.com/spf13/afero v1.6.0
-	github.com/stretchr/testify v1.7.0
+	github.com/rs/zerolog v1.29.1
+	github.com/spf13/afero v1.9.5
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rs/xid v1.3.0 // indirect
-	golang.org/x/text v0.3.3 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	github.com/rs/xid v1.4.0 // indirect
+	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/service-maintenance/go.sum b/service-maintenance/go.sum