merfe from main

DFE-Digital · Oct 18, 2024 · 18b5377 · 18b5377
2 parents 99e673c + 1bf427d
commit 18b5377
Show file tree

Hide file tree

Showing 18 changed files with 101 additions and 54 deletions.
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
@@ -43,7 +43,7 @@ jobs:
   deploy-image:
     name: Deploy '${{ needs.set-env.outputs.branch }}' to ${{ needs.set-env.outputs.environment }}
     needs: [ set-env ]
-    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.4.0
+    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.5.0
     with:
       docker-image-name: 'aca-app'
       docker-build-file-name: './Dockerfile'

diff --git a/.github/workflows/continuous-integration-terraform.yml b/.github/workflows/continuous-integration-terraform.yml
@@ -28,7 +28,7 @@ jobs:
           fi
 
       - name: Validate Terraform docs
-        uses: terraform-docs/gh-actions@v1.2.0
+        uses: terraform-docs/gh-actions@v1.3.0
         with:
           working-dir: terraform
           config-file: .terraform-docs.yml
@@ -40,19 +40,19 @@ jobs:
         run: rm ./terraform/backend.tf
 
       - name: Run a Terraform init
-        uses: docker://hashicorp/terraform:1.9.5
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform init
 
       - name: Run a Terraform validate
-        uses: docker://hashicorp/terraform:1.9.5
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform validate
 
       - name: Run a Terraform format check
-        uses: docker://hashicorp/terraform:1.9.5
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform fmt -check=true -diff=true

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -41,7 +41,7 @@ jobs:
           github-pat: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload scan results to GitHub Security
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'
diff --git a/Dfe.Academies.Academisation.Data.UnitTest/Dfe.Academies.Academisation.Data.UnitTest.csproj b/Dfe.Academies.Academisation.Data.UnitTest/Dfe.Academies.Academisation.Data.UnitTest.csproj
@@ -11,10 +11,10 @@
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
     <PackageReference Include="Bogus" Version="35.5.1" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

diff --git a/...cademies.Academisation.Domain.UnitTest/Dfe.Academies.Academisation.Domain.UnitTest.csproj b/...cademies.Academisation.Domain.UnitTest/Dfe.Academies.Academisation.Domain.UnitTest.csproj
@@ -11,9 +11,9 @@
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
     <PackageReference Include="Bogus" Version="35.5.1" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Dfe.Academies.Academisation.Domain/Dfe.Academies.Academisation.Domain.csproj b/Dfe.Academies.Academisation.Domain/Dfe.Academies.Academisation.Domain.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.5.0" />
     <PackageReference Include="FluentValidation" Version="11.9.2" />
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
   </ItemGroup>
 

diff --git a/Dfe.Academies.Academisation.IDomain/Dfe.Academies.Academisation.IDomain.csproj b/Dfe.Academies.Academisation.IDomain/Dfe.Academies.Academisation.IDomain.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Dfe.Academies.Academisation.IService/Dfe.Academies.Academisation.IService.csproj b/Dfe.Academies.Academisation.IService/Dfe.Academies.Academisation.IService.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/...demies.Academisation.Service.UnitTest/Dfe.Academies.Academisation.Service.UnitTest.csproj b/...demies.Academisation.Service.UnitTest/Dfe.Academies.Academisation.Service.UnitTest.csproj
@@ -10,9 +10,9 @@
 		<PackageReference Include="AutoFixture" Version="4.18.1" />
 		<PackageReference Include="Bogus" Version="35.5.1" />
 		<PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
-		<PackageReference Include="FluentAssertions" Version="6.12.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="Moq" Version="4.20.70" />
+		<PackageReference Include="Moq" Version="4.20.72" />
 		<PackageReference Include="xunit" Version="2.8.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>

diff --git a/Dfe.Academies.Academisation.Service/Dfe.Academies.Academisation.Service.csproj b/Dfe.Academies.Academisation.Service/Dfe.Academies.Academisation.Service.csproj
@@ -24,8 +24,8 @@
     <PackageReference Include="ClosedXML" Version="0.102.3" />
     <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.10" />
     <PackageReference Include="Dfe.Academisation.ExtensionMethods" Version="2.0.0" />
-    <PackageReference Include="MediatR" Version="12.4.0" />
     <PackageReference Include="Polly" Version="8.4.2" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...cademies.Academisation.WebApi.UnitTest/Dfe.Academies.Academisation.WebApi.UnitTest.csproj b/...cademies.Academisation.WebApi.UnitTest/Dfe.Academies.Academisation.WebApi.UnitTest.csproj
@@ -16,9 +16,9 @@
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Dfe.Academies.Academisation.WebApi/Dfe.Academies.Academisation.WebApi.csproj b/Dfe.Academies.Academisation.WebApi/Dfe.Academies.Academisation.WebApi.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Dfe.Academisation.CorrelationIdMiddleware" Version="2.0.2" />
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.3.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.8" />

diff --git a/terraform/.terraform-version b/terraform/.terraform-version
@@ -1 +1 @@
-1.9.5
+1.9.6
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl