Merge branch 'main' into UML-3570-refactor-templates-to-work-with-com…

…bined-format-summary # Conflicts: # service-front/app/src/Common/src/Entity/Casters/CastToHowAttorneysMakeDecisions.php # service-front/app/src/Common/src/Entity/CombinedLpa.php # service-front/app/src/Common/src/Entity/LpaStore/LpaStore.php # service-front/app/src/Common/src/Entity/LpaStore/LpaStoreAttorney.php # service-front/app/src/Common/src/Entity/LpaStore/LpaStoreDonor.php # service-front/app/src/Common/src/Entity/Person.php # service-front/app/src/Common/src/Entity/Sirius/SiriusLpaTrustCorporations.php # service-front/app/src/Common/src/Service/Lpa/ParseLpaData.php # service-front/app/src/Common/src/View/Twig/LpaExtension.php # service-front/app/src/Common/templates/partials/full-lpa-display-combined-lpa.html.twig # service-front/app/test/CommonTest/Entity/CombinedLpaTest.php # service-front/app/test/CommonTest/Entity/LpaStore/CanHydrateLpaStoreToModerniseFormatTest.php # service-front/app/test/CommonTest/Entity/LpaStore/CanHydrateSiriusToModerniseFormatTest.php # service-front/app/test/CommonTest/Entity/LpaStore/CanSerialiseLpaStoreToModerniseFormatTest.php # service-front/app/test/CommonTest/Entity/LpaStore/CanSerialiseSiriusToModerniseFormatTest.php # service-front/app/test/CommonTest/Helper/EntityTestHelper.php # service-front/app/test/CommonTest/Service/Lpa/ParseLpaDataTest.php
ministryofjustice · Nov 28, 2024 · a7e2386 · a7e2386
2 parents eec0d06 + 2d37ddb
commit a7e2386
Show file tree

Hide file tree

Showing 42 changed files with 313 additions and 575 deletions.
diff --git a/.github/workflows/_build-and-push.yml b/.github/workflows/_build-and-push.yml
@@ -113,7 +113,7 @@ jobs:
 
       - name: ecr login
         id: login_ecr
-        uses: aws-actions/amazon-ecr-login@82e0fc39d1cb50e0db083a0a18ae1b775ef44892 # [email protected]
+        uses: aws-actions/amazon-ecr-login@37b726ebcaba9d1c1838caf54540902bad814823 # [email protected]
         with:
           registries: 311462405659
         if: |

diff --git a/.github/workflows/_lint-terraform.yml b/.github/workflows/_lint-terraform.yml
@@ -30,7 +30,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # [email protected]
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 

diff --git a/.github/workflows/_run-behat-tests.yml b/.github/workflows/_run-behat-tests.yml
@@ -30,7 +30,7 @@ jobs:
           chrome-version: stable
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@944fb41c67bf260d77ef9eab76dfb859c2fd9cb2 # [email protected]
+        uses: shivammathur/setup-php@e77cdb393f70751e0417891f9ae9de6a41096210 # [email protected]
         with:
           php-version: 8.3
 

diff --git a/.github/workflows/_run-terraform.yml b/.github/workflows/_run-terraform.yml
@@ -71,7 +71,7 @@ jobs:
 
       - uses: unfor19/install-aws-cli-action@27d6061dae5d39e89be4d2246824f15e111a7e06 # [email protected]
 
-      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # [email protected]
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # [email protected]
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
 

diff --git a/.github/workflows/path-to-live.yml b/.github/workflows/path-to-live.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: get changed docs files in any folder
         id: changed-files-docs
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             **/*.md

diff --git a/.github/workflows/pull-request-path.yml b/.github/workflows/pull-request-path.yml
@@ -50,19 +50,19 @@ jobs:
 
       - name: get changed files in the admin folder
         id: changed-files-admin
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             service-admin/**
       - name: get changed files in the terraform folder
         id: changed-files-terraform
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             terraform/**
       - name: get changed docs files in any folder
         id: changed-files-docs
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             **/*.md

diff --git a/.github/workflows/scheduled-workspace-cleanup.yml b/.github/workflows/scheduled-workspace-cleanup.yml
@@ -31,7 +31,7 @@ jobs:
           TF_VERSION=$(cat .terraform-version)
           echo "TF_VERSION=$TF_VERSION" >> $GITHUB_OUTPUT
 
-      - uses: hashicorp/setup-terraform@fd3bf06534214722507d89f9d499612bf7799787 # pin@v2
+      - uses: hashicorp/setup-terraform@344fef46b6edc7c46ce8b3b8b0a3ece7e77e05f0 # pin@v2
         with:
           terraform_version: ${{ steps.set-terraform-version.outputs.TF_VERSION }}
           terraform_wrapper: false

diff --git a/.github/workflows/workflow-deploy-ref-to-env.yml b/.github/workflows/workflow-deploy-ref-to-env.yml
@@ -60,13 +60,13 @@ jobs:
 
       - name: get changed files in the admin folder
         id: changed-files-admin
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             service-admin/**
       - name: get changed files in the terraform folder
         id: changed-files-terraform
-        uses: tj-actions/changed-files@fe1bc0e3d35d94ed03a43d070f62cce13ce558ff
+        uses: tj-actions/changed-files@c19a7eb771f8275e97686d1d3b6fde437cbd3f48
         with:
           files: |
             terraform/**

diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ The Viewer service will be available via [http://localhost:9001/home](http://loc
 
 The Actor service will be available via [http://localhost:9002/home](http://localhost:9002/home)
 
-The API service will be available via [http://localhost:9003](http://localhost:9003)
+The API service will be available via [http://localhost:9010](http://localhost:9010)
 
 ### Tests
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -161,7 +161,7 @@ services:
     volumes:
       - ./service-api/web/dist:/web
     ports:
-      - 9005:80
+      - 9010:80
     environment:
       APP_HOST: api-app
       APP_PORT: 9000

diff --git a/lambda-functions/ingestion-lambda/Dockerfile b/lambda-functions/ingestion-lambda/Dockerfile
@@ -0,0 +1,17 @@
+FROM golang:1.23.1-alpine AS base
+
+WORKDIR /app
+
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+COPY cmd/ingestion ./cmd/ingestion
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o /go/bin/ingestion ./cmd/ingestion
+
+FROM scratch AS production
+
+COPY --from=base /go/bin/ingestion ingestion
+
+ENTRYPOINT ["./ingestion"]
diff --git a/scripts/add_historical_statistics/go.mod b/scripts/add_historical_statistics/go.mod
@@ -5,27 +5,27 @@ go 1.22
 toolchain go1.23.3
 
 require (
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.44
-	github.com/aws/aws-sdk-go-v2/service/sts v1.32.4
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.46
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.1
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.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
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.32.4
-	github.com/aws/aws-sdk-go-v2/config v1.28.3
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.36.5
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.4 // indirect
-	github.com/aws/smithy-go v1.22.0 // indirect
+	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/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/service/dynamodb v1.37.1
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
+	github.com/aws/smithy-go v1.22.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/ministryofjustice/opg-go-common v1.31.0
+	github.com/ministryofjustice/opg-go-common v1.38.0
 )