Merge branch 'main' into education-status-fix

.github/workflows/build-and-push-image.yml

@@ -63,7 +63,7 @@ jobs:
           registry: ${{ secrets.AZURE_ACR_URL }}
 
       - name: Build and push docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile

.github/workflows/build.yml

@@ -57,8 +57,8 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
-        dotnet-sonarscanner begin /k:"DFE-Digital-prepare-conversions" /o:"dfe-digital" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.coverageReportPaths=CoverageReport/SonarQube.xml
+        dotnet-sonarscanner begin /k:"DFE-Digital-prepare-conversions" /o:"dfe-digital" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.coverageReportPaths=CoverageReport/SonarQube.xml
         dotnet build Dfe.PrepareConversions/Dfe.PrepareConversions.sln --no-restore
         dotnet test Dfe.PrepareConversions/Dfe.PrepareConversions.sln --no-build --verbosity normal --collect:"XPlat Code Coverage"
         reportgenerator -reports:./**/coverage.cobertura.xml -targetdir:./Dfe.PrepareConversions/CoverageReport -reporttypes:SonarQube
-        dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+        dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

.github/workflows/continuous-integration-terraform.yml

@@ -40,25 +40,25 @@ jobs:
         run: rm ./terraform/backend.tf
 
       - name: Run a Terraform init
-        uses: docker://hashicorp/terraform:1.5.7
+        uses: docker://hashicorp/terraform:1.6.4
         with:
           entrypoint: terraform
           args: -chdir=terraform init
 
       - name: Run a Terraform validate
-        uses: docker://hashicorp/terraform:1.5.7
+        uses: docker://hashicorp/terraform:1.6.4
         with:
           entrypoint: terraform
           args: -chdir=terraform validate
 
       - name: Run a Terraform format check
-        uses: docker://hashicorp/terraform:1.5.7
+        uses: docker://hashicorp/terraform:1.6.4
         with:
           entrypoint: terraform
           args: -chdir=terraform fmt -check=true -diff=true
 
       - name: Setup TFLint
-        uses: terraform-linters/setup-tflint@v3
+        uses: terraform-linters/setup-tflint@v4
         with:
           tflint_version: v0.44.1
 

Dfe.PrepareConversions/Dfe.PrepareConversions.CypressTests/.eslintrc.json

@@ -11,10 +11,14 @@
     "cypress/no-pause": "error"
   },
   "env": {
-    "cypress/globals": true
+    "cypress/globals": true,
+    "node": true
   },
   "extends": [
     "plugin:cypress/recommended",
     "eslint:recommended"
-  ]
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2022
+  }
 }